| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- $OpenBSD: patch-src_c_wrapper_c,v 1.1.1.1 2013/07/10 14:40:29 jasper Exp $
- --- src/c/wrapper.c.orig Tue Jul 2 14:18:26 2013
- +++ src/c/wrapper.c Tue Jul 2 14:21:35 2013
- @@ -98,7 +98,7 @@
- #elif defined(AIX) || defined(HPUX) || defined(MACOSX) || defined(OSF1)
- #elif defined(IRIX)
- #define PATH_MAX FILENAME_MAX
- - #elif defined(FREEBSD)
- + #elif defined(FREEBSD) || defined(OPENBSD)
- #include <sys/param.h>
- #include <errno.h>
- #else /* LINUX */
- @@ -3978,7 +3978,7 @@ int wrapperRunCommonInner() {
- tz1 = tzname[0];
- tz2 = tzname[1];
- #endif
- -#ifndef FREEBSD
- +#if !defined(FREEBSD) && !defined(OPENBSD)
- log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Timezone: %s (%s) Offset: %ld, hasDaylight: %d"),
- tz1, tz2, timezone, daylight);
- #else
- @@ -4555,7 +4555,7 @@ int checkIfBinary(const TCHAR *filename) {
- log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, TEXT("Magic number for file %s: 0x%02x%02x%02x%02x"), filename, head[0], head[1], head[2], head[3]);
- }
-
- -#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS)
- +#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS) || defined(OPENBSD)
- if (head[1] == 'E' && head[2] == 'L' && head[3] == 'F') {
- return 1; /*ELF */
- #elif defined(AIX)
- @@ -5834,7 +5834,7 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
-
- /* See if the auto bits parameter is set. Ignored by all but the following platforms. */
-
- -#if /*defined(WIN32) || defined(LINUX) ||*/ defined(HPUX) || defined(MACOSX) || defined(SOLARIS) || defined(FREEBSD)
- +#if /*defined(WIN32) || defined(LINUX) ||*/ defined(HPUX) || defined(MACOSX) || defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD)
-
-
- if (getBooleanProperty(properties,
- @@ -5851,6 +5851,8 @@ int wrapperBuildJavaCommandArrayInner(TCHAR **strings,
- TEXT("wrapper.java.additional.auto_bits.freebsd"),
- #elif defined(MACOSX)
- TEXT("wrapper.java.additional.auto_bits.macosx"),
- +#elif defined(OPENBSD)
- + TEXT("wrapper.java.additional.auto_bits.openbsd"),
- #endif
- getBooleanProperty(properties, TEXT("wrapper.java.additional.auto_bits"), FALSE, showWarnings),
- showWarnings)) {
|
