Merge

Tue, 20 Aug 2013 17:40:15 -0700

author
lana
date
Tue, 20 Aug 2013 17:40:15 -0700
changeset 772
e8a3edda1f60
parent 765
ceefd94ef326
parent 771
00dcfaa6bc01
child 773
056398db9dcb

Merge

     1.1 --- a/common/autoconf/generated-configure.sh	Thu Aug 15 09:25:23 2013 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue Aug 20 17:40:15 2013 -0700
     1.3 @@ -3794,7 +3794,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1373384053
     1.8 +DATE_WHEN_GENERATED=1375350569
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -29582,7 +29582,7 @@
    1.13      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
    1.14  fi
    1.15  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    1.16 -    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
    1.17 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
    1.18      # Setting these parameters makes it an error to link to macosx APIs that are
    1.19      # newer than the given OS version and makes the linked binaries compatible even
    1.20      # if built on a newer version of the OS.
     2.1 --- a/common/autoconf/toolchain.m4	Thu Aug 15 09:25:23 2013 -0700
     2.2 +++ b/common/autoconf/toolchain.m4	Tue Aug 20 17:40:15 2013 -0700
     2.3 @@ -905,7 +905,7 @@
     2.4      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
     2.5  fi
     2.6  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     2.7 -    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
     2.8 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
     2.9      # Setting these parameters makes it an error to link to macosx APIs that are
    2.10      # newer than the given OS version and makes the linked binaries compatible even
    2.11      # if built on a newer version of the OS.

mercurial