Mercurial > hg > graal-compiler

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children
line wrap: on
line diff
--- a/src/share/vm/libadt/port.hpp	Thu Oct 16 10:21:29 2014 +0200
+++ b/src/share/vm/libadt/port.hpp	Wed Oct 15 16:02:50 2014 +0200
@@ -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++