src/share/vm/libadt/port.hpp

rev 5032 : 8023033: PPC64 (part 13): basic changes for AIX
Summary: Added AIX includes alpha-sorted before BSD. Fix compilation issues with xlC in shared code. Basic shared platform dependend adaption (vm_version etc.).

@@ -89,12 +89,10 @@
 // IBM's xlC compiler
 #define INTERFACE
 #define IMPLEMENTATION
 #include <stdlib.h>
 #include <memory.h>
-inline int min( int a, int b) { return a < b ? a : b; }
-inline int max( int a, int b) { return a > b ? a : b; }
 
 #elif defined(_MSC_VER)
 // Microsoft Visual C++
 //#define INTERFACE
 #define IMPLEMENTATION

@@ -190,12 +188,15 @@
 // Do not define these for Tandem, because they conflict with typedefs in softieee.h.
 typedef float float32;          // 32-bit float
 typedef double float64;         // 64-bit float
 #endif // __TANDEM
 
+#ifndef _AIX
+// These conflict with /usr/include/sys/inttypes.h on aix.
 typedef jlong int64;            // Java long for my 64-bit type
 typedef julong uint64;          // Java long for my 64-bit type
+#endif
 
 //-----------------------------------------------------------------------------
 // Nice constants
 uint32 gcd( uint32 x, uint32 y );
 int ff1( uint32 mask );