diff options
| author | glewis <glewis@FreeBSD.org> | 2004-08-13 05:54:01 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2004-08-13 05:54:01 +0800 |
| commit | a3976d11549a700001a76530017a83f3d4177e39 (patch) | |
| tree | 81b77c10431939dda594ecb65c821e5fb855f63a /java/jdk14 | |
| parent | 5d27a9c930416d2f627bec5845063f3a18f9654e (diff) | |
| download | freebsd-ports-gnome-a3976d11549a700001a76530017a83f3d4177e39.tar.gz freebsd-ports-gnome-a3976d11549a700001a76530017a83f3d4177e39.tar.zst freebsd-ports-gnome-a3976d11549a700001a76530017a83f3d4177e39.zip | |
. Fix the build for gcc 3.4.
PR: 69853
Submitted by: Jake Hamby <jhamby@anobject.com>
Approved by: phantom (maintainer)
Diffstat (limited to 'java/jdk14')
| -rw-r--r-- | java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp | 21 | ||||
| -rw-r--r-- | java/jdk14/files/patch-plugin_ns600_nscore.h | 13 | ||||
| -rw-r--r-- | java/jdk14/files/patch-plugin_ns610_nscore.h | 13 |
3 files changed, 47 insertions, 0 deletions
diff --git a/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp b/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp new file mode 100644 index 000000000000..7f39f7cceabb --- /dev/null +++ b/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp @@ -0,0 +1,21 @@ +$FreeBSD$ + +--- ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp.orig Fri Jul 30 18:00:09 2004 ++++ ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp Fri Jul 30 22:11:36 2004 +@@ -937,14 +937,14 @@ + CMAPMapper::CharsToGlyphs( + int count, const Unicode16 unicodes[], UInt32 glyphs[]) const + { +- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs); ++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs); + } + + void + CMAPMapper::CharsToGlyphs( + int count, const Unicode32 unicodes[], UInt32 glyphs[]) const + { +- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs); ++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs); + } + + ////////////////////////////////////////////////////////////////////////////// diff --git a/java/jdk14/files/patch-plugin_ns600_nscore.h b/java/jdk14/files/patch-plugin_ns600_nscore.h new file mode 100644 index 000000000000..9e4bcacf650a --- /dev/null +++ b/java/jdk14/files/patch-plugin_ns600_nscore.h @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h.orig Fri Jul 30 18:00:04 2004 ++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h Fri Jul 30 23:32:31 2004 +@@ -163,7 +163,7 @@ + */ + + /* under Metrowerks (Mac), we don't have autoconf yet */ +-#ifdef __MWERKS__ ++#if defined(__MWERKS__) || defined(NS_UNIX) + #define HAVE_CPP_SPECIALIZATION + #define HAVE_CPP_PARTIAL_SPECIALIZATION + #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX diff --git a/java/jdk14/files/patch-plugin_ns610_nscore.h b/java/jdk14/files/patch-plugin_ns610_nscore.h new file mode 100644 index 000000000000..de8cc76e5fa3 --- /dev/null +++ b/java/jdk14/files/patch-plugin_ns610_nscore.h @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h.orig Fri Jul 30 18:00:05 2004 ++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h Fri Jul 30 23:23:36 2004 +@@ -163,7 +163,7 @@ + */ + + /* under Metrowerks (Mac), we don't have autoconf yet */ +-#ifdef __MWERKS__ ++#if defined(__MWERKS__) || defined(NS_UNIX) + #define HAVE_CPP_SPECIALIZATION + #define HAVE_CPP_PARTIAL_SPECIALIZATION + #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX |