/hg/icedtea6: PR632: 6878713.patch breaks shark zero build

[mjw at icedtea.classpath.org]

changeset 3f247fe29393 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3f247fe29393
author: Mark Wielaard <mark at klomp.org>
date: Wed Feb 16 22:23:50 2011 +0100

	PR632: 6878713.patch breaks shark zero build

	2011-02-16 Xerxes Ranby <xerxes at zafena.se> Mark
	Wielaard <mark at klomp.org>

	 PR632: 6878713.patch breaks shark zero build
	        * patches/icedtea-stdc-limit-macros.patch
	(openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp):
	Only define __STDC_LIMIT_MACROS if undefined.
	        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	        * NEWS: Updated.


diffstat:

4 files changed, 24 insertions(+)
ChangeLog                               |   10 ++++++++++
Makefile.am                             |    1 +
NEWS                                    |    1 +
patches/icedtea-stdc-limit-macros.patch |   12 ++++++++++++

diffs (55 lines):

diff -r 58276c6748af -r 3f247fe29393 ChangeLog
--- a/ChangeLog	Wed Feb 16 20:22:31 2011 +0000
+++ b/ChangeLog	Wed Feb 16 22:23:50 2011 +0100
@@ -1,3 +1,13 @@ 2011-02-16  Andrew John Hughes  <ahughes
+2011-02-16  Xerxes Ranby  <xerxes at zafena.se>
+	    Mark Wielaard  <mark at klomp.org>
+
+	PR632: 6878713.patch breaks shark zero build
+	* patches/icedtea-stdc-limit-macros.patch
+	(openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp):
+	Only define __STDC_LIMIT_MACROS if undefined.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+
 2011-02-16  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-nomotif-6706121.patch:
diff -r 58276c6748af -r 3f247fe29393 Makefile.am
--- a/Makefile.am	Wed Feb 16 20:22:31 2011 +0000
+++ b/Makefile.am	Wed Feb 16 22:23:50 2011 +0100
@@ -186,6 +186,7 @@ SECURITY_PATCHES = patches/security/2011
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
+	patches/icedtea-stdc-limit-macros.patch \
 	patches/openjdk/4993545-nativeinlightfixer.patch \
 	patches/openjdk/6637796-set_bounds.patch \
 	patches/openjdk/6607660-treelock.patch \
diff -r 58276c6748af -r 3f247fe29393 NEWS
--- a/NEWS	Wed Feb 16 20:22:31 2011 +0000
+++ b/NEWS	Wed Feb 16 22:23:50 2011 +0100
@@ -418,6 +418,7 @@ New in release 1.10 (2011-XX-XX):
   - S7015232: missing copyright header in CheckZOrderChange.java
   - S7017581: missing copyright header in test/sun/java2d/pipe/RegionOps.java
   - S6896068: SunGraphics2D exposes a reference to itself while non fully initialised.
+  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
 * Bug fixes
   - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
   - PR616, PR99: Don't statically link libstdc++ or libgcc
diff -r 58276c6748af -r 3f247fe29393 patches/icedtea-stdc-limit-macros.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-stdc-limit-macros.patch	Wed Feb 16 22:23:50 2011 +0100
@@ -0,0 +1,12 @@
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -72,7 +72,9 @@
+ # endif
+
+ #ifdef LINUX
++#ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
++#endif
+ #include <inttypes.h>
+ #include <signal.h>
+ #include <ucontext.h>