aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-10-18 12:57:08 +0200
committerSven Gothel <sgothel@jausoft.com>2011-10-18 12:57:08 +0200
commit958b64beb44a470301a4354ae7d5133236e2f40f (patch)
tree066e0a3ceac11e79065b4ae4f36b37d887d96fe0
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'
-rw-r--r--make/build-jogl.xml14
-rw-r--r--make/build-nativewindow.xml39
-rw-r--r--make/build-newt.xml21
-rw-r--r--make/build-test.xml10
-rwxr-xr-xmake/scripts/make.jogl.all.solaris-x86.sh52
-rwxr-xr-xmake/scripts/make.jogl.all.solaris-x86_64.sh52
-rwxr-xr-xmake/scripts/tests-solx32.sh10
-rwxr-xr-xmake/scripts/tests-solx64.sh10
-rw-r--r--make/stub_includes/opengl/GL/glxext.h33
-rw-r--r--src/nativewindow/native/x11/XineramaHelper.c4
-rw-r--r--src/nativewindow/native/x11/Xmisc.c4
11 files changed, 188 insertions, 61 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 0cf7c178c..a8d75501b 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1069,32 +1069,26 @@
<linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
<syslibset dir="/usr/local/lib" libs="X11"/>
- <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.freebsd.amd64.jogl.x11" extends="linker.cfg.freebsd.amd64">
<syslibset dir="/usr/local/lib" libs="X11"/>
- <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.x86.jogl.x11" extends="linker.cfg.linux.x86">
<syslibset libs="X11"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.amd64.jogl.x11" extends="linker.cfg.linux.amd64">
<syslibset libs="X11"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
<syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11"/>
- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
@@ -1105,13 +1099,13 @@
</linker>
<linker id="linker.cfg.solaris.sparcv9.jogl.x11" extends="linker.cfg.solaris.sparcv9">
- <linkerarg value="-xarch=v9a" />
- <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+ <linkerarg value="-L/usr/lib/sparcv9"/>
+ <syslibset libs="X11"/>
</linker>
<linker id="linker.cfg.solaris.amd64.jogl.x11" extends="linker.cfg.solaris.amd64">
- <linkerarg value="-xarch=amd64" />
- <syslibset dir="/usr/lib/amd64" libs="X11"/>
+ <linkerarg value="-L/usr/lib/amd64"/>
+ <syslibset libs="X11"/>
</linker>
<linker id="linker.cfg.win32.mingw.jogl" extends="linker.cfg.win32.mingw">
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 45674c64e..4bbe667b8 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -342,6 +342,18 @@
<compilerarg value="/usr/include" />
</compiler>
+ <compiler id="compiler.cfg.solaris.nativewindow.x11" extends="compiler.cfg.solaris">
+ <compilerarg value="-I/usr/X11R6/include" />
+ </compiler>
+
+ <compiler id="compiler.cfg.solaris.nativewindow.x11.sparcv9" extends="compiler.cfg.solaris.sparcv9">
+ <compilerarg value="-I/usr/X11R6/include" />
+ </compiler>
+
+ <compiler id="compiler.cfg.solaris.nativewindow.x11.amd64" extends="compiler.cfg.solaris.amd64">
+ <compilerarg value="-I/usr/X11R6/include" />
+ </compiler>
+
<!-- linker configuration -->
<linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
@@ -387,15 +399,32 @@
</linker>
<linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
+ <linkerarg value="-L/usr/sfw/lib"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xxf86vm" />
+ <syslibset libs="Xinerama"/>
+ <syslibset libs="Xrender"/>
<syslibset libs="X11"/>
</linker>
<linker id="linker.cfg.solaris.sparcv9.nativewindow.x11" extends="linker.cfg.solaris.sparcv9">
- <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+ <linkerarg value="-L/usr/lib/sparcv9"/>
+ <linkerarg value="-L/usr/sfw/lib/sparcv9"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xxf86vm" />
+ <syslibset libs="Xinerama"/>
+ <syslibset libs="Xrender"/>
+ <syslibset libs="X11"/>
</linker>
<linker id="linker.cfg.solaris.amd64.nativewindow.x11" extends="linker.cfg.solaris.amd64">
- <syslibset dir="/usr/lib/amd64" libs="X11"/>
+ <linkerarg value="-L/usr/lib/amd64"/>
+ <linkerarg value="-L/usr/sfw/lib/amd64"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xxf86vm" />
+ <syslibset libs="Xinerama"/>
+ <syslibset libs="Xrender"/>
+ <syslibset libs="X11"/>
</linker>
<linker id="linker.cfg.win32.mingw.nativewindow" extends="linker.cfg.win32.mingw">
@@ -475,21 +504,21 @@
<target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
<echo message="Solaris" />
- <property name="compiler.cfg.id" value="compiler.cfg.solaris" />
+ <property name="compiler.cfg.id" value="compiler.cfg.solaris.nativewindow.x11" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.nativewindow.x11" />
</target>
<target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
<echo message="SolarisSparcv9" />
- <property name="compiler.cfg.id" value="compiler.cfg.solaris.sparcv9" />
+ <property name="compiler.cfg.id" value="compiler.cfg.solaris.nativewindow.x11.sparcv9" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.sparcv9.nativewindow.x11" />
</target>
<target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
<echo message="SolarisAMD64" />
- <property name="compiler.cfg.id" value="compiler.cfg.solaris.amd64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.solaris.nativewindow.x11.amd64" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.nativewindow.x11" />
</target>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index e433b289c..d3248fa9d 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -239,15 +239,15 @@
<!-- linker configuration -->
<linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
- <syslibset dir="/usr/local/lib" libs="X11"/>
+ <linkerarg value="-L/usr/local/lib"/>
+ <syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
- <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
- <syslibset dir="/usr/local/lib" libs="X11"/>
+ <linkerarg value="-L/usr/local/lib"/>
+ <syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
- <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
@@ -258,25 +258,21 @@
<linker id="linker.cfg.linux.newt.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.x86.newt.x11" extends="linker.cfg.linux.x86">
<syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.amd64.newt.x11" extends="linker.cfg.linux.amd64">
<syslibset libs="X11"/>
<syslibset libs="Xrandr"/>
- <syslibset libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
<syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
<syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
</linker>
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
@@ -285,14 +281,19 @@
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
<syslibset libs="X11"/>
+ <syslibset libs="Xrandr"/>
</linker>
<linker id="linker.cfg.solaris.sparcv9.newt.x11" extends="linker.cfg.solaris.sparcv9">
- <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
+ <linkerarg value="-L/usr/lib/sparcv9"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xrandr"/>
</linker>
<linker id="linker.cfg.solaris.amd64.newt.x11" extends="linker.cfg.solaris.amd64">
- <syslibset dir="/usr/lib/amd64" libs="X11"/>
+ <linkerarg value="-L/usr/lib/amd64"/>
+ <syslibset libs="X11"/>
+ <syslibset libs="Xrandr"/>
</linker>
<linker id="linker.cfg.win32.mingw.newt" extends="linker.cfg.win32.mingw">
diff --git a/make/build-test.xml b/make/build-test.xml
index 19b917476..f011fdad5 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -31,6 +31,8 @@
<condition property="jvmarg.mainthrd" value="-Ddummy"><not><isset property="isOSX"/></not></condition>
<condition property="jvmarg.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
<condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
+ <condition property="jvmarg.arch" value="-d64"><isset property="is64Bit"/></condition>
+ <condition property="jvmarg.arch" value="-d32"><not><isset property="is64Bit"/></not></condition>
<property name="batchtest.timeout" value="1800000"/> <!-- 30 min -->
</target>
@@ -151,6 +153,7 @@
<!-- Test*NOUI* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmarg.arch}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
@@ -214,6 +217,7 @@
failonerror="false">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
<env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/>
+ <arg line="${jvmarg.arch}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<arg line="${jvmarg.headless}"/>
<!--
@@ -248,6 +252,7 @@
<!-- Test*NEWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmarg.arch}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
@@ -282,6 +287,7 @@
<!-- Test*AWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmarg.arch}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
@@ -316,6 +322,7 @@
<!-- Test*AWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmarg.arch}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
@@ -373,6 +380,7 @@
failonerror="false">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
<env key="CLASSPATH" value="${junit_jogl_swt.run.jars}"/>
+ <arg line="${jvmarg.arch}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<arg line="${jvmarg.headless}"/>
<!--
@@ -404,6 +412,7 @@
<!-- Test*SWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmarg.arch}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<jvmarg value="${jvmarg.mainthrd}"/>
@@ -437,6 +446,7 @@
<target name="junit.run.newt.awt" depends="test.compile">
<!-- Test*AWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">
+ <jvmarg value="${jvmarg.arch}"/>
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
diff --git a/make/scripts/make.jogl.all.solaris-x86.sh b/make/scripts/make.jogl.all.solaris-x86.sh
new file mode 100755
index 000000000..a5b99e47b
--- /dev/null
+++ b/make/scripts/make.jogl.all.solaris-x86.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+SDIR=`dirname $0`
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+fi
+
+if [ "$1" = "-libdir" ] ; then
+ shift
+ if [ -z "$1" ] ; then
+ echo libdir argument missing
+ print_usage
+ exit
+ fi
+ CUSTOMLIBDIR="-Dcustom.libdir=$1"
+ shift
+fi
+
+# -Dc.compiler.debug=true \
+
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxAMD64=true \
+# -DisX11=true \
+
+#LD_LIBRARY_PATH=/opt-linux-x86/mesa-7.8.1/lib
+#export LD_LIBRARY_PATH
+
+LOGF=make.jogl.all.solaris-x86.log
+rm -f $LOGF
+
+# export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri
+# export LIBGL_DEBUG=verbose
+echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
+echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
+echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
+
+# -Dc.compiler.debug=true \
+# -Djavacdebug="true" \
+# -Djavacdebuglevel="source,lines,vars" \
+
+# BUILD_ARCHIVE=true \
+ant \
+ $CUSTOMLIBDIR \
+ -Djavacdebuglevel="source,lines,vars" \
+ -Drootrel.build=build-solaris-x86 \
+ -Dsetup.addNativeOpenMAX=true \
+ -Dsetup.addNativeKD=true \
+ $* 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/make.jogl.all.solaris-x86_64.sh b/make/scripts/make.jogl.all.solaris-x86_64.sh
new file mode 100755
index 000000000..ff6031957
--- /dev/null
+++ b/make/scripts/make.jogl.all.solaris-x86_64.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+SDIR=`dirname $0`
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+if [ "$1" = "-libdir" ] ; then
+ shift
+ if [ -z "$1" ] ; then
+ echo libdir argument missing
+ print_usage
+ exit
+ fi
+ CUSTOMLIBDIR="-Dcustom.libdir=$1"
+ shift
+fi
+
+# -Dc.compiler.debug=true \
+
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxAMD64=true \
+# -DisX11=true \
+
+#LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64
+#export LD_LIBRARY_PATH
+
+LOGF=make.jogl.all.solaris-x86_64.log
+rm -f $LOGF
+
+# export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri
+# export LIBGL_DEBUG=verbose
+echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
+echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
+echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
+
+# -Dc.compiler.debug=true \
+# -Djavacdebug="true" \
+# -Djavacdebuglevel="source,lines,vars" \
+
+# BUILD_ARCHIVE=true \
+ant \
+ $CUSTOMLIBDIR \
+ -Djavacdebuglevel="source,lines,vars" \
+ -Drootrel.build=build-solaris-x86_64 \
+ -Dsetup.addNativeOpenMAX=true \
+ -Dsetup.addNativeKD=true \
+ $* 2>&1 | tee -a $LOGF
+
diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh
new file mode 100755
index 000000000..26b7c14bb
--- /dev/null
+++ b/make/scripts/tests-solx32.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+SDIR=`dirname $0`
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh
+fi
+
+. $SDIR/tests.sh `which java` ../build-solaris-x86 $*
+
diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh
new file mode 100755
index 000000000..b5667e508
--- /dev/null
+++ b/make/scripts/tests-solx64.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+SDIR=`dirname $0`
+
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+ . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
+. $SDIR/tests.sh `which java` ../build-solaris-x86_64 $*
+
diff --git a/make/stub_includes/opengl/GL/glxext.h b/make/stub_includes/opengl/GL/glxext.h
index c6f2feacb..06dbb271b 100644
--- a/make/stub_includes/opengl/GL/glxext.h
+++ b/make/stub_includes/opengl/GL/glxext.h
@@ -408,38 +408,7 @@ typedef unsigned int GLXVideoDeviceNV;
#ifndef GLEXT_64_TYPES_DEFINED
/* This code block is duplicated in glxext.h, so must be protected */
#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GLX_OML_sync_control extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h> /* Fallback option */
-#endif
+#include "gl-64bit-types.h"
#endif
#ifndef GLX_ARB_get_proc_address
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)