diff options
Diffstat (limited to 'uxa/uxa-priv.h')
| -rw-r--r-- | uxa/uxa-priv.h | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h index d469474d..363b9f70 100644 --- a/uxa/uxa-priv.h +++ b/uxa/uxa-priv.h @@ -328,30 +328,8 @@ extern const GCOps uxa_ops; /* XXX these come from shmint.h, which isn't exported by the server */ #ifdef HAVE_XEXTPROTO_71 -/* Up to xextproto 7.1, these were provided in shmstr.h */ -typedef struct _ShmFuncs { - PixmapPtr (* CreatePixmap)(ScreenPtr pScreen, - int width, - int height, - int depth, - char *addr); - void (* PutImage)(DrawablePtr dst, - GCPtr pGC, - int depth, - unsigned int format, - int w, - int h, - int sx, - int sy, - int sw, - int sh, - int dx, - int dy, - char *data); -} ShmFuncs, *ShmFuncsPtr; -#endif - -extern ShmFuncs uxa_shm_funcs; +#include "shmint.h" +#else void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); @@ -361,6 +339,9 @@ ShmSetPixmapFormat(ScreenPtr pScreen, int format); void fbShmPutImage(XSHM_PUT_IMAGE_ARGS); +#endif + +extern ShmFuncs uxa_shm_funcs; #endif |