Mercurial > hg > truffle

diff src/share/vm/adlc/adlc.hpp @ 14521:29ccc4cbabca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents a7e8ff4a1838
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/adlc/adlc.hpp	Tue Mar 11 15:34:06 2014 +0100
+++ b/src/share/vm/adlc/adlc.hpp	Wed Mar 12 13:30:08 2014 +0100
@@ -38,6 +38,9 @@
 #include "stdarg.h"
 #include <sys/types.h>
 
+/* Make sure that we have the intptr_t and uintptr_t definitions */
+#ifdef _WIN32
+
 #if _MSC_VER >= 1300
 using namespace std;
 #endif
@@ -46,8 +49,6 @@
 #define strdup _strdup
 #endif
 
-/* Make sure that we have the intptr_t and uintptr_t definitions */
-#ifdef _WIN32
 #ifndef _INTPTR_T_DEFINED
 #ifdef _WIN64
 typedef __int64 intptr_t;
@@ -65,6 +66,7 @@
 #endif
 #define _UINTPTR_T_DEFINED
 #endif
+
 #endif // _WIN32
 
 #if defined(LINUX) || defined(_ALLBSD_SOURCE)