Mercurial > hg > truffle
comparison src/share/vm/adlc/adlc.hpp @ 14521:29ccc4cbabca
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 12 Mar 2014 13:30:08 +0100 |
parents | a7e8ff4a1838 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14520:f84115370178 | 14521:29ccc4cbabca |
---|---|
36 #include "string.h" | 36 #include "string.h" |
37 #include "ctype.h" | 37 #include "ctype.h" |
38 #include "stdarg.h" | 38 #include "stdarg.h" |
39 #include <sys/types.h> | 39 #include <sys/types.h> |
40 | 40 |
41 /* Make sure that we have the intptr_t and uintptr_t definitions */ | |
42 #ifdef _WIN32 | |
43 | |
41 #if _MSC_VER >= 1300 | 44 #if _MSC_VER >= 1300 |
42 using namespace std; | 45 using namespace std; |
43 #endif | 46 #endif |
44 | 47 |
45 #if _MSC_VER >= 1400 | 48 #if _MSC_VER >= 1400 |
46 #define strdup _strdup | 49 #define strdup _strdup |
47 #endif | 50 #endif |
48 | 51 |
49 /* Make sure that we have the intptr_t and uintptr_t definitions */ | |
50 #ifdef _WIN32 | |
51 #ifndef _INTPTR_T_DEFINED | 52 #ifndef _INTPTR_T_DEFINED |
52 #ifdef _WIN64 | 53 #ifdef _WIN64 |
53 typedef __int64 intptr_t; | 54 typedef __int64 intptr_t; |
54 #else | 55 #else |
55 typedef int intptr_t; | 56 typedef int intptr_t; |
63 #else | 64 #else |
64 typedef unsigned int uintptr_t; | 65 typedef unsigned int uintptr_t; |
65 #endif | 66 #endif |
66 #define _UINTPTR_T_DEFINED | 67 #define _UINTPTR_T_DEFINED |
67 #endif | 68 #endif |
69 | |
68 #endif // _WIN32 | 70 #endif // _WIN32 |
69 | 71 |
70 #if defined(LINUX) || defined(_ALLBSD_SOURCE) | 72 #if defined(LINUX) || defined(_ALLBSD_SOURCE) |
71 #include <inttypes.h> | 73 #include <inttypes.h> |
72 #endif // LINUX || _ALLBSD_SOURCE | 74 #endif // LINUX || _ALLBSD_SOURCE |