From 958b64beb44a470301a4354ae7d5133236e2f40f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 18 Oct 2011 12:57:08 +0200 Subject: 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' --- src/nativewindow/native/x11/XineramaHelper.c | 4 ++-- src/nativewindow/native/x11/Xmisc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 #include -#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 #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) -- cgit v1.2.3