summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2007-05-11 13:54:44 -0400
committerKristian Høgsberg <[email protected]>2007-10-10 17:09:48 -0400
commitfa72013adaab4d0755e852805e2e44d1a879a204 (patch)
treeb025eb6e9809372049a8fa196bdc58a8d443ecad
parent9590ba97ad6606a96b50a66242f606c860ca239d (diff)
Drop mostly unused __DRIid typedef.
-rw-r--r--include/GL/internal/dri_interface.h1
-rw-r--r--src/glx/x11/XF86dri.c6
-rw-r--r--src/glx/x11/glxcmds.c2
-rw-r--r--src/glx/x11/xf86dri.h6
4 files changed, 7 insertions, 8 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 98271ad0aff..9cb5920aa01 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -56,7 +56,6 @@ typedef struct __DRIdriverRec __DRIdriver;
typedef struct __DRIframebufferRec __DRIframebuffer;
typedef struct __DRIversionRec __DRIversion;
typedef struct __DRIinterfaceMethodsRec __DRIinterfaceMethods;
-typedef unsigned long __DRIid;
/*@}*/
diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index b44ebaf3296..5b0bf14afe9 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -376,7 +376,7 @@ PUBLIC Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
}
PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen,
- __DRIid context )
+ XID context )
{
XExtDisplayInfo *info = find_display (dpy);
xXF86DRIDestroyContextReq *req;
@@ -397,7 +397,7 @@ PUBLIC GLboolean XF86DRIDestroyContext(Display *dpy, int screen,
}
PUBLIC GLboolean XF86DRICreateDrawable(Display *dpy, int screen,
- __DRIid drawable, drm_drawable_t * hHWDrawable )
+ XID drawable, drm_drawable_t * hHWDrawable )
{
XExtDisplayInfo *info = find_display (dpy);
xXF86DRICreateDrawableReply rep;
@@ -431,7 +431,7 @@ static int noopErrorHandler(Display *dpy, XErrorEvent *xerr)
}
PUBLIC GLboolean XF86DRIDestroyDrawable(Display *dpy, int screen,
- __DRIid drawable )
+ XID drawable )
{
XExtDisplayInfo *info = find_display (dpy);
xXF86DRIDestroyDrawableReq *req;
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 75790c977ee..31316463811 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -82,7 +82,7 @@ static int windowExistsErrorHandler(Display *dpy, XErrorEvent *xerr)
*/
static void GarbageCollectDRIDrawables(Display *dpy, __GLXscreenConfigs *sc)
{
- __DRIid draw;
+ XID draw;
__GLXdrawable *pdraw;
XWindowAttributes xwa;
int (*oldXErrorHandler)(Display *, XErrorEvent *);
diff --git a/src/glx/x11/xf86dri.h b/src/glx/x11/xf86dri.h
index ddac7db266c..69a2d74fb27 100644
--- a/src/glx/x11/xf86dri.h
+++ b/src/glx/x11/xf86dri.h
@@ -95,13 +95,13 @@ Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
extern GLboolean XF86DRIDestroyContext( Display *dpy, int screen,
- __DRIid context_id );
+ XID context_id );
extern GLboolean XF86DRICreateDrawable( Display *dpy, int screen,
- __DRIid drawable, drm_drawable_t *hHWDrawable );
+ XID drawable, drm_drawable_t *hHWDrawable );
extern GLboolean XF86DRIDestroyDrawable( Display *dpy, int screen,
- __DRIid drawable);
+ XID drawable);
Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
unsigned int *index, unsigned int *stamp,