# HG changeset patch
# User doko@ubuntu.com
# Date 1301055946 -3600
# Node ID 015d29e3b82a388bdb73b626ada3d89fd0a3e4f9
# Parent  d8e980ec37e76f66bbe7307bd20f70e7c3b5d244
PR632: 6878713.patch breaks shark zero build

2011-02-16  Xerxes Ranby  <xerxes@zafena.se>
            Mark Wielaard  <mark@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.

diff -r d8e980ec37e7 -r 015d29e3b82a ChangeLog
--- a/ChangeLog	Thu Feb 24 16:28:01 2011 +0100
+++ b/ChangeLog	Fri Mar 25 13:25:46 2011 +0100
@@ -1,3 +1,13 @@
+2011-03-25  Xerxes Ranby  <xerxes@zafena.se>
+            Mark Wielaard  <mark@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-24  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am: Add patch.
diff -r d8e980ec37e7 -r 015d29e3b82a Makefile.am
--- a/Makefile.am	Thu Feb 24 16:28:01 2011 +0100
+++ b/Makefile.am	Fri Mar 25 13:25:46 2011 +0100
@@ -263,6 +263,7 @@
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
+	patches/icedtea-stdc-limit-macros.patch \
 	patches/zero/6890308.patch \
 	patches/zero/6891677.patch \
 	patches/zero/6896043.patch \
diff -r d8e980ec37e7 -r 015d29e3b82a NEWS
--- a/NEWS	Thu Feb 24 16:28:01 2011 +0100
+++ b/NEWS	Fri Mar 25 13:25:46 2011 +0100
@@ -13,6 +13,7 @@
 * Backports
   - S6675802: Regression: heavyweight popups cause SecurityExceptions in applets
   - S6691503: Malicious applet can show always-on-top popup menu which has whole screen size
+  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
 
 New in release 1.8.7 (2011-02-15):
 
diff -r d8e980ec37e7 -r 015d29e3b82a patches/icedtea-stdc-limit-macros.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-stdc-limit-macros.patch	Fri Mar 25 13:25:46 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>