diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:31 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:31 +0000 |
| commit | 7e018a8e4a0f8519e0fca19c5a70b9bb4bacd402 (patch) | |
| tree | f62c24617ddc9ece3ee5fc252be716aac981dc3f /shmstr.h | |
| parent | dab35027e56ba9c3c575dc41a041168bab00b4bb (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
Diffstat (limited to 'shmstr.h')
| -rw-r--r-- | shmstr.h | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. #define SHM_MINOR_VERSION 1 #ifdef _XSHM_SERVER_ -#if NeedFunctionPrototypes #define XSHM_PUT_IMAGE_ARGS \ DrawablePtr /* dst */, \ GCPtr /* pGC */, \ @@ -61,20 +60,13 @@ in this Software without prior written authorization from The Open Group. int /* dx */, \ int /* dy */, \ char * /* data */ -#else -#define XSHM_PUT_IMAGE_ARGS /* nothing */ -#endif -#if NeedFunctionPrototypes #define XSHM_CREATE_PIXMAP_ARGS \ ScreenPtr /* pScreen */, \ int /* width */, \ int /* height */, \ int /* depth */, \ char * /* addr */ -#else -#define XSHM_CREATE_PIXMAP_ARGS /* nothing */ -#endif typedef struct _ShmFuncs { PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); |