Merge
authorlana
Fri, 23 Aug 2013 14:09:00 -0700
changeset 19313 9d6df965d19f
parent 19310 61f02e19db01 (current diff)
parent 19312 c845296e6936 (diff)
child 19315 e164aa20de40
child 19521 36758336c4cd
Merge
common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Aug 22 09:09:55 2013 -0700
+++ b/common/autoconf/generated-configure.sh	Fri Aug 23 14:09:00 2013 -0700
@@ -29573,7 +29573,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 22 09:09:55 2013 -0700
+++ b/common/autoconf/toolchain.m4	Fri Aug 23 14:09:00 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.