diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-05-15 07:00:18 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-05-15 07:00:18 +0200 |
| commit | d13c08099c8db06cf4fa107b0b867c9cf31e1940 (patch) | |
| tree | a1f7796ee21896f6a570e8043762df1a331d8569 | |
| parent | 691dc6e106dcc364f2cea9859656ff1aa523b9a4 (diff) | |
Fix incorrect logic in awt_GraphicsEnv.c
| -rw-r--r-- | debian/patches/kfreebsd-support-jdk.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/kfreebsd-support-jdk.diff b/debian/patches/kfreebsd-support-jdk.diff index b7230ff..290e540 100644 --- a/debian/patches/kfreebsd-support-jdk.diff +++ b/debian/patches/kfreebsd-support-jdk.diff @@ -1103,7 +1103,7 @@ index 2c81ca4..ec5e6f1 100644 } #endif -#if !defined(__linux__) && !defined(MACOSX) /* Solaris */ -+#if !defined(__linux__) && !defined(MACOSX) || !defined(__GLIBC__) /* Solaris */ ++#if !defined(__linux__) && !defined(MACOSX) && !defined(__GLIBC__) /* Solaris */ static void xinerama_init_solaris() { void* libHandle = NULL; @@ -1126,7 +1126,7 @@ index 2c81ca4..ec5e6f1 100644 jobject point = NULL; #ifndef HEADLESS /* return NULL in HEADLESS, Linux */ -#if !defined(__linux__) && !defined(MACOSX) -+#if !defined(__linux__) && !defined(MACOSX) || !defined(__GLIBC__) ++#if !defined(__linux__) && !defined(MACOSX) && !defined(__GLIBC__) int x,y; AWT_LOCK(); @@ -1505,7 +1505,7 @@ index 0dcdbc7..11790f5 100644 #define MAXFDIRS 512 /* Max number of directories that contain fonts */ -#if !defined(__linux__) && !defined(MACOSX) -+#if !defined(__linux__) && !defined(MACOSX) || defined(__GLIBC__) ++#if !defined(__linux__) && !defined(MACOSX) && !defined(__GLIBC__) /* * This can be set in the makefile to "/usr/X11" if so desired. */ |