Mercurial > hg > graal-compiler
diff src/share/vm/adlc/adlc.hpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | a7e8ff4a1838 |
children |
line wrap: on
line diff
--- a/src/share/vm/adlc/adlc.hpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/adlc/adlc.hpp Tue Apr 01 13:57:07 2014 +0200 @@ -38,9 +38,6 @@ #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 @@ -49,6 +46,8 @@ #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; @@ -66,7 +65,6 @@ #endif #define _UINTPTR_T_DEFINED #endif - #endif // _WIN32 #if defined(LINUX) || defined(_ALLBSD_SOURCE)