diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-08 12:59:15 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-08 12:59:15 +0000 |
| commit | 86356155018fce96ba3367fd1a48a18cd6db3c40 (patch) | |
| tree | fcf1f11b557f02e60a20edf2776e6a1e3c554051 | |
| parent | 03dc05a6051abe94590f21dd1451dc45ec0ac306 (diff) | |
Check for some header defines before redefining functions. Silences warnings.
| -rw-r--r-- | include/GL/internal/dri_interface.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index ced714d43e..9c430469b2 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -149,6 +149,8 @@ typedef GLboolean (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int s int * backX, int * backY, int * numBackClipRects, drm_clip_rect_t ** pBackClipRects ); +/* Test for the xf86dri.h header file */ +#ifndef _XF86DRI_H_ extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen, __DRIid context_id ); @@ -157,6 +159,7 @@ extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen, extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, __DRIid drawable); +#endif /*@}*/ 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 */ |