summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2007-02-05 03:20:30 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2007-02-05 03:20:30 +0000
commit1c61b1297d761c2f536a48f98fce7e6c2746f258 (patch)
tree6a39f443c880daf310c9cc96bd2c84c723f7652f /src
parent502f83219ddb31190530647732d86fb49fe9c9df (diff)
Fix glXGetProcAddressARB() usage and support for POSIX threads on HP-UX 11.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5660 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/glut_compatability.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx
index 836f0ad6a..7b8832f43 100644
--- a/src/glut_compatability.cxx
+++ b/src/glut_compatability.cxx
@@ -38,9 +38,12 @@
#include "flstring.h"
#if HAVE_GL
-#include <FL/glut.H>
-
-#define MAXWINDOWS 32
+# include <FL/glut.H>
+# ifdef HAVE_GLXGETPROCADDRESSARB
+# define GLX_GLXEXT_LEGACY
+# include <GL/glx.h>
+# endif // HAVE_GLXGETPROCADDRESSARB
+# define MAXWINDOWS 32
static Fl_Glut_Window *windows[MAXWINDOWS+1];
Fl_Glut_Window *glut_window;
@@ -437,7 +440,7 @@ GLUTproc glutGetProcAddress(const char *procName) {
# ifdef WIN32
return (GLUTproc)wglGetProcAddress((LPCSTR)procName);
# elif defined(HAVE_GLXGETPROCADDRESSARB)
- return (GLUTproc)glXGetProcAddressARB(procName);
+ return (GLUTproc)glXGetProcAddressARB((const GLubyte *)procName);
# else
return (GLUTproc)0;
# endif // WIN32