aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2005-01-28 01:57:28 +0000
committerKenneth Russel <[email protected]>2005-01-28 01:57:28 +0000
commit5b5b8fe543ec1e4189db1c9de4cea8755a2e3ddc (patch)
tree2bc35c8f3b23a9597c184c8b39f839fd91b9967d /make
parent1f270f455f6f0aea1102352fedec5c20e0632cce (diff)
Fixed build breakage on Windows and other non-X11 platforms after
changes to make X11 build work on 64-bit platforms git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@192 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
-rw-r--r--make/gl-common-x11.cfg1
-rw-r--r--make/gl-glx-common.cfg4
2 files changed, 5 insertions, 0 deletions
diff --git a/make/gl-common-x11.cfg b/make/gl-common-x11.cfg
index 5bc2ee8b6..dcaeac4f2 100644
--- a/make/gl-common-x11.cfg
+++ b/make/gl-common-x11.cfg
@@ -5,6 +5,7 @@ Include gl-common.cfg
JavaOutputDir ../build/gensrc/classes
NativeOutputDir ../build/gensrc/native/jogl
+# XID needs to be treated as a long for 32/64 bit compatibility
Opaque long XID
# Get returned array's capacity from XGetVisualInfo to be correct
diff --git a/make/gl-glx-common.cfg b/make/gl-glx-common.cfg
index 93e5f794c..a613149bc 100644
--- a/make/gl-glx-common.cfg
+++ b/make/gl-glx-common.cfg
@@ -79,3 +79,7 @@ Ignore GLXHyperpipeNetworkSGIX
Ignore GLXHyperpipeConfigSGIX
Ignore GLXPipeRect
Ignore GLXPipeRectLimits
+
+# XID shows up in the public API (and shouldn't -- will be removed in
+# the JSR 231/239 APIs) and needs to be treated as a long for now
+Opaque long XID