diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:12:26 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-10-13 15:12:26 +0000 |
| commit | 03fdfe46e66ea22466d5022b8b181d2d68df9ba6 (patch) | |
| tree | 2a3c93f8c8050c8f09bb342cccb8ff5a5a32e6b5 /java/jdk15 | |
| parent | . Fix javaws. (diff) | |
. Fix javaws.
Approved by: phantom (maintainer)
Notes
Notes:
svn path=/head/; revision=145271
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/files/patch-deploy::native::msgString.c | 13 | ||||
| -rw-r--r-- | java/jdk15/files/patch-deploy::native::system_md.c | 13 | ||||
| -rw-r--r-- | java/jdk15/files/patch-deploy::native::system_md.h | 28 |
3 files changed, 54 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-deploy::native::msgString.c b/java/jdk15/files/patch-deploy::native::msgString.c new file mode 100644 index 000000000000..8021bcfb9f8a --- /dev/null +++ b/java/jdk15/files/patch-deploy::native::msgString.c @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/share/native/msgString.c 19 May 2005 19:55:19 -0000 1.2 ++++ ../../deploy/src/javaws/share/native/msgString.c 5 Oct 2005 17:59:39 -0000 +@@ -146,7 +146,7 @@ + if (value == NULL) { + value = defaultMessage; + } +-#ifdef __OpenBSD__ /* XXXBSD: DISABLE_LOCALE */ ++#if defined(__OpenBSD__) || defined(__FreeBSD__) /* XXXBSD: DISABLE_LOCALE */ + v2 = strdup(value); + #else + len2 = DecodeMessage(value, wArray); diff --git a/java/jdk15/files/patch-deploy::native::system_md.c b/java/jdk15/files/patch-deploy::native::system_md.c new file mode 100644 index 000000000000..d6fc6938e78c --- /dev/null +++ b/java/jdk15/files/patch-deploy::native::system_md.c @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/solaris/native/system_md.c 19 May 2005 19:38:24 -0000 1.4 ++++ ../../deploy/src/javaws/solaris/native/system_md.c 5 Oct 2005 17:59:39 -0000 +@@ -10,7 +10,7 @@ + * unicode conversion for now at all. It means that japanese, korean, + * chinese, etc locales are not available. + */ +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__FreeBSD__) + #define DISABLE_LOCALE 1 + #endif + diff --git a/java/jdk15/files/patch-deploy::native::system_md.h b/java/jdk15/files/patch-deploy::native::system_md.h new file mode 100644 index 000000000000..9f2043021b08 --- /dev/null +++ b/java/jdk15/files/patch-deploy::native::system_md.h @@ -0,0 +1,28 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/solaris/native/system_md.h 8 Nov 2004 22:26:54 -0000 1.1.1.1 ++++ ../../deploy/src/javaws/solaris/native/system_md.h 5 Oct 2005 17:59:39 -0000 +@@ -35,6 +35,23 @@ + #ifdef LINUX + #define PLATFORM "Linux" + #define ARCH "i386" ++#elif _ALLBSD_SOURCE /* LINUX */ ++#ifdef __FreeBSD__ ++#define PLATFORM "FreeBSD" ++#elif __NetBSD__ ++#define PLATFORM "NetBSD" ++#elif __OpenBSD__ ++#define PLATFORM "OpenBSD" ++#elif __DragonFly__ ++#define PLATFORM "DragonFly" ++#endif ++#ifdef __amd64__ ++#define ARCH "amd64" ++#elif __i386__ ++#define ARCH "i386" ++#else ++#error "Unsupported architecture" ++#endif + #else /* LINUX */ + #define PLATFORM "SunOS" + #ifdef __i386 |