summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hopf <mhopf@suse.de>2006-01-13 16:06:10 +0000
committerMatthias Hopf <mhopf@suse.de>2006-01-13 16:06:10 +0000
commit36c5e81eff50ef34f8b96014c8ee04c0563ab853 (patch)
tree3f0c0c9fb90046c2b402c3e3e813ceb65cffbe0b
parentd7bbc6892078a0541dd4302277eb67ff0bd90e0d (diff)
Using glXGetProcAddressARB instead of glXGetProcAddress.
Casting to GLubyte* to remove warning.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--xdriinfo.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index caa1640..72e8894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-13 Matthias Hopf <mhopf@suse.de>
+
+ * configure.ac:
+ Using glXGetProcAddressARB instead of glXGetProcAddress.
+ * xdriinfo.c: (main):
+ Casting to GLubyte* to remove warning.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index f6700c6..bb575bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AC_SUBST(XDRIINFO_CFLAGS)
AC_SUBST(XDRIINFO_LIBS)
# Checks for non-pkg-config packages (Mesa or vendor OpenGL)
-AC_SEARCH_LIBS([glXGetProcAddress], [GL], [],
+AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
[$XDRIINFO_LIBS])
diff --git a/xdriinfo.c b/xdriinfo.c
index ebd368b..75ab773 100644
--- a/xdriinfo.c
+++ b/xdriinfo.c
@@ -58,8 +58,8 @@ int main (int argc, char *argv[]) {
char *funcArg = NULL;
char *dpyName = NULL;
- GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddressARB ("glXGetScreenDriver");
- GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddressARB ("glXGetDriverConfig");
+ GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddressARB ((const GLubyte *)"glXGetScreenDriver");
+ GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddressARB ((const GLubyte *)"glXGetDriverConfig");
if (!GetScreenDriver || !GetDriverConfig) {
fprintf (stderr, "libGL is too old.\n");
return 1;