summaryrefslogtreecommitdiffstats
path: root/src/nativewindow/native/x11
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-10-18 12:57:08 +0200
committerSven Gothel <[email protected]>2011-10-18 12:57:08 +0200
commit958b64beb44a470301a4354ae7d5133236e2f40f (patch)
tree066e0a3ceac11e79065b4ae4f36b37d887d96fe0 /src/nativewindow/native/x11
parent7eaeacc4148f0ec6146e5cc8db010a7414a7b419 (diff)
Fix Solaris gcc args ; Cleanup dependencies and linker args; Adding JVM arch flags (-d32/-d64) ; glxext.h uses 'gl-64bit-types.h'
Cleanup dependencies and linker args - JOGL/NEWT: remove Xxf86vm dependency - NativeWindow Solaris: Use std 'Xinerama' and 'xf86vmode'
Diffstat (limited to 'src/nativewindow/native/x11')
-rw-r--r--src/nativewindow/native/x11/XineramaHelper.c4
-rw-r--r--src/nativewindow/native/x11/Xmisc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nativewindow/native/x11/XineramaHelper.c b/src/nativewindow/native/x11/XineramaHelper.c
index a4d380e13..62c02c8c8 100644
--- a/src/nativewindow/native/x11/XineramaHelper.c
+++ b/src/nativewindow/native/x11/XineramaHelper.c
@@ -39,7 +39,7 @@
#include <X11/Xlib.h>
#include <stdio.h>
-#ifdef __sun
+#ifdef __sun_obsolete
typedef Status XineramaGetInfoFunc(Display* display, int screen_number,
XRectangle* framebuffer_rects, unsigned char* framebuffer_hints,
@@ -57,7 +57,7 @@ XineramaGetCenterHintFunc* XineramaSolarisCenterFunc = NULL;
#endif
Bool XineramaEnabled(Display* display) {
-#ifdef __sun
+#ifdef __sun_obsolete
#define MAXFRAMEBUFFERS 16
char* XinExtName = "XINERAMA";
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
index cc0b1a1ef..d481343f9 100644
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -43,7 +43,7 @@
/* Current versions of Solaris don't expose the XF86 extensions,
although with the recent transition to Xorg this will probably
happen in an upcoming release */
-#if !defined(__sun) && !defined(_HPUX)
+#if !defined(__sun_obsolete) && !defined(_HPUX)
#include <X11/extensions/xf86vmode.h>
#else
/* Need to provide stubs for these */
@@ -73,7 +73,7 @@ Bool XF86VidModeSetGammaRamp(
unsigned short *blue_array) {
return False;
}
-#endif /* defined(__sun) || defined(_HPUX) */
+#endif /* defined(__sun_obsolete) || defined(_HPUX) */
/* HP-UX doesn't define RTLD_DEFAULT. */
#if defined(_HPUX) && !defined(RTLD_DEFAULT)