Mercurial > hg > truffle
diff src/share/vm/libadt/port.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | 2b8e28fdf503 |
children | 4ca6dc0799b6 |
line wrap: on
line diff
--- a/src/share/vm/libadt/port.hpp Mon Mar 24 10:48:44 2014 -0700 +++ b/src/share/vm/libadt/port.hpp Wed Mar 26 18:21:05 2014 -0700 @@ -91,8 +91,6 @@ #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++