comparison src/share/vm/libadt/port.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
89 // IBM's xlC compiler 89 // IBM's xlC compiler
90 #define INTERFACE 90 #define INTERFACE
91 #define IMPLEMENTATION 91 #define IMPLEMENTATION
92 #include <stdlib.h> 92 #include <stdlib.h>
93 #include <memory.h> 93 #include <memory.h>
94 inline int min( int a, int b) { return a < b ? a : b; }
95 inline int max( int a, int b) { return a > b ? a : b; }
96 94
97 #elif defined(_MSC_VER) 95 #elif defined(_MSC_VER)
98 // Microsoft Visual C++ 96 // Microsoft Visual C++
99 //#define INTERFACE 97 //#define INTERFACE
100 #define IMPLEMENTATION 98 #define IMPLEMENTATION