summaryrefslogtreecommitdiff
path: root/java/openjdk6/files/patch-set
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-03-06 00:50:28 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-03-06 00:50:28 +0000
commit0f7f30e0b6084a2cbd4b8718e0629ee43e430afb (patch)
treed7cc0e27c2e50cd501beef2b9faad0637d0b5537 /java/openjdk6/files/patch-set
parentUpdate to 25.0.1364.152 (diff)
Add multiple security patches from IcedTea6 1.12.3.
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-February/021858.html http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-February/021998.html Obtained from: IcedTea Project
Notes
Notes: svn path=/head/; revision=313491
Diffstat (limited to 'java/openjdk6/files/patch-set')
-rw-r--r--java/openjdk6/files/patch-set6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index ae59dafe8471..0fabe80c09e8 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -11233,9 +11233,9 @@
typedef unsigned long uLong;
#endif
+#endif
- #ifdef _MSC_VER
- typedef LONGLONG jlong;
- typedef DWORDLONG julong;
+ #ifdef _MSC_VER
+ typedef LONGLONG jlong;
+ typedef DWORDLONG julong;
--- jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+++ jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
@@ -33,9 +33,14 @@