diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
| commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
| tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /include/gc.h | |
| parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) | |
| download | xserver-60014a4a98ff924ae7f6840781f768c1cc93bbab.tar.gz | |
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'include/gc.h')
| -rw-r--r-- | include/gc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gc.h b/include/gc.h index 6e5b92da2..ecaa257bb 100644 --- a/include/gc.h +++ b/include/gc.h @@ -88,7 +88,7 @@ extern _X_EXPORT void ValidateGC(DrawablePtr /*pDraw */ , typedef union { CARD32 val; - pointer ptr; + void *ptr; } ChangeGCVal, *ChangeGCValPtr; extern int ChangeGCXIDs(ClientPtr /*client */ , @@ -112,7 +112,7 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ , GCPtr /*pgcDst */ , BITS32 /*mask */ ); -extern _X_EXPORT int FreeGC(pointer /*pGC */ , +extern _X_EXPORT int FreeGC(void */*pGC */ , XID /*gid */ ); extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ ); |