mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-30 21:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for some header defines before redefining functions. Silences warnings.

Browse Source
This commit is contained in:
Alan Hourihane 2004-12-08 12:59:15 +00:00
parent 03dc05a605
commit 8635615501
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/GL/internal/dri_interface.h
View File

@ -149,6 +149,8 @@ typedef GLboolean (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int s
int * backX, int * backY, int * backX, int * backY,
int * numBackClipRects, drm_clip_rect_t ** pBackClipRects ); int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
/* Test for the xf86dri.h header file */
#ifndef _XF86DRI_H_
extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen, extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
__DRIid context_id ); __DRIid context_id );
@ -157,6 +159,7 @@ extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen,
__DRIid drawable); __DRIid drawable);
#endif
/*@}*/ /*@}*/

3
src/mesa/drivers/dri/common/dri_util.h
View File

@ -558,8 +558,11 @@ extern float
driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,
int64_t last_swap_ust, int64_t current_ust ); int64_t last_swap_ust, int64_t current_ust );
/* Test for the GLX header glx.h */
#ifndef GLX
extern void extern void
(*glXGetProcAddress(const GLubyte *procname))( void ); (*glXGetProcAddress(const GLubyte *procname))( void );
#endif
#endif /* GLX_DIRECT_RENDERING */ #endif /* GLX_DIRECT_RENDERING */