summaryrefslogtreecommitdiff
path: root/shmstr.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:02 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:02 +0000
commit023a09fe640f876478157e5b4cd9cfec1452da4b (patch)
treef62c24617ddc9ece3ee5fc252be716aac981dc3f /shmstr.h
parent343e78e15048e6a25791449bfc7566c07ccddf28 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
Diffstat (limited to 'shmstr.h')
-rw-r--r--shmstr.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/shmstr.h b/shmstr.h
index a445413..a175b23 100644
--- a/shmstr.h
+++ b/shmstr.h
@@ -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);