summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2004-12-08 12:59:15 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2004-12-08 12:59:15 +0000
commit86356155018fce96ba3367fd1a48a18cd6db3c40 (patch)
treefcf1f11b557f02e60a20edf2776e6a1e3c554051 /src/mesa/drivers/dri
parent03dc05a6051abe94590f21dd1451dc45ec0ac306 (diff)
Check for some header defines before redefining functions. Silences warnings.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/common/dri_util.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index cdb6576377..f85a2fb68e 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -558,8 +558,11 @@ extern float
driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,
int64_t last_swap_ust, int64_t current_ust );
+/* Test for the GLX header glx.h */
+#ifndef GLX
extern void
(*glXGetProcAddress(const GLubyte *procname))( void );
+#endif
#endif /* GLX_DIRECT_RENDERING */