Merge
authorlana
Tue, 20 Aug 2013 17:40:15 -0700
changeset 19312 c845296e6936
parent 19259 ab14dee837db (current diff)
parent 19311 741980fe0b33 (diff)
child 19313 9d6df965d19f
Merge
--- a/common/autoconf/generated-configure.sh	Thu Aug 15 09:25:23 2013 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Aug 20 17:40:15 2013 -0700
@@ -3794,7 +3794,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1373384053
+DATE_WHEN_GENERATED=1375350569
 
 ###############################################################################
 #
@@ -29582,7 +29582,7 @@
     CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
 fi
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
+    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
     # Setting these parameters makes it an error to link to macosx APIs that are
     # newer than the given OS version and makes the linked binaries compatible even
     # if built on a newer version of the OS.
--- a/common/autoconf/toolchain.m4	Thu Aug 15 09:25:23 2013 -0700
+++ b/common/autoconf/toolchain.m4	Tue Aug 20 17:40:15 2013 -0700
@@ -905,7 +905,7 @@
     CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
 fi
 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
+    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
     # Setting these parameters makes it an error to link to macosx APIs that are
     # newer than the given OS version and makes the linked binaries compatible even
     # if built on a newer version of the OS.