diff options
Diffstat (limited to 'X11/extensions/XShm.h')
| -rw-r--r-- | X11/extensions/XShm.h | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/X11/extensions/XShm.h b/X11/extensions/XShm.h index 4ae14ca8b..23f065115 100644 --- a/X11/extensions/XShm.h +++ b/X11/extensions/XShm.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/include/extensions/XShm.h,v 1.11 2003/04/03 15:11:07 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,29 +26,15 @@ in this Software without prior written authorization from The Open Group. /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $Xorg: XShm.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - #ifndef _XSHM_H_ #define _XSHM_H_ #include <X11/Xfuncproto.h> +#include <X11/extensions/shm.h> -#define X_ShmQueryVersion 0 -#define X_ShmAttach 1 -#define X_ShmDetach 2 -#define X_ShmPutImage 3 -#define X_ShmGetImage 4 -#define X_ShmCreatePixmap 5 - -#define ShmCompletion 0 -#define ShmNumberEvents (ShmCompletion + 1) - -#define BadShmSeg 0 -#define ShmNumberErrors (BadShmSeg + 1) - +#ifndef _XSHM_SERVER_ typedef unsigned long ShmSeg; -#ifndef _XSHM_SERVER_ typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ @@ -90,17 +75,17 @@ int XShmPixmapFormat( Display* /* dpy */ ); -Status XShmAttach( +Bool XShmAttach( Display* /* dpy */, XShmSegmentInfo* /* shminfo */ ); -Status XShmDetach( +Bool XShmDetach( Display* /* dpy */, XShmSegmentInfo* /* shminfo */ ); -Status XShmPutImage( +Bool XShmPutImage( Display* /* dpy */, Drawable /* d */, GC /* gc */, @@ -114,7 +99,7 @@ Status XShmPutImage( Bool /* send_event */ ); -Status XShmGetImage( +Bool XShmGetImage( Display* /* dpy */, Drawable /* d */, XImage* /* image */, @@ -145,17 +130,6 @@ Pixmap XShmCreatePixmap( ); _XFUNCPROTOEND - -#else /* _XSHM_SERVER_ */ - -#include "screenint.h" -#include "pixmap.h" -#include "gc.h" - -extern void ShmRegisterFbFuncs( - ScreenPtr /* pScreen */ -); - -#endif +#endif /* _XSHM_SERVER_ */ #endif |