summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2007-04-21 01:34:54 +0000
committerKenneth Russel <[email protected]>2007-04-21 01:34:54 +0000
commitd22ef032e84a79f86683db1e2f829f403c4bb3e2 (patch)
treef95661d00a85104a605a9aa6f847c6ad49e366ac /make
parent2d10eb3db6578a369a1038a6173e7fa78d005fcc (diff)
Re-fixed Issue 226: JOGL seg faulting on Solaris AMD64
The autogenerated GLX_JNI.c was not receiving a prototype for glXGetProcAddressARB and so was receiving the implicit one returning an int, which is obviously wrong on 64-bit architectures. Re-fixed this bug by providing a prototype; removed the workaround in X11GLDrawableFactory. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1211 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
-rwxr-xr-xmake/glx-CustomCCode.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/make/glx-CustomCCode.c b/make/glx-CustomCCode.c
index 3b9130662..2beaa0b2b 100755
--- a/make/glx-CustomCCode.c
+++ b/make/glx-CustomCCode.c
@@ -76,3 +76,9 @@ Java_com_sun_opengl_impl_x11_GLX_dlsym(JNIEnv *env, jclass _unused, jstring name
(*env)->ReleaseStringUTFChars(env, name, chars);
return (jlong) ((intptr_t) res);
}
+
+/* We expect glXGetProcAddressARB to be defined */
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+
+/* Need to pull this in as we don't have a stub header for it */
+extern Bool XineramaEnabled(Display* display);