diff options
author | Keith Packard <keithp@keithp.com> | 2010-05-13 18:22:49 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-05-13 18:22:49 -0700 |
commit | 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534 (patch) | |
tree | 8bdcc020ca5ff5d5eef28f9acfb365daef1b8bde /include | |
parent | f2a0c324e37c9fa3eb9087adbf963addb7f21d88 (diff) | |
parent | 92ed75ac59e2d3af149cddb962efd05fc8487750 (diff) |
Merge remote branch 'jamey/cleanups'
Diffstat (limited to 'include')
-rw-r--r-- | include/colormap.h | 6 | ||||
-rw-r--r-- | include/gc.h | 9 | ||||
-rw-r--r-- | include/gcstruct.h | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/include/colormap.h b/include/colormap.h index de48ce8d8..1b1574839 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -135,7 +135,8 @@ extern _X_EXPORT int QueryColors( ColormapPtr /*pmap*/, int /*count*/, Pixel* /*ppixIn*/, - xrgb* /*prgbList*/); + xrgb* /*prgbList*/, + ClientPtr client); extern _X_EXPORT int FreeClientPixels( pointer /*pcr*/, @@ -173,7 +174,8 @@ extern _X_EXPORT int FreeColors( extern _X_EXPORT int StoreColors( ColormapPtr /*pmap*/, int /*count*/, - xColorItem* /*defs*/); + xColorItem* /*defs*/, + ClientPtr client); extern _X_EXPORT int IsMapInstalled( Colormap /*map*/, diff --git a/include/gc.h b/include/gc.h index 3fa953d56..63eecbd66 100644 --- a/include/gc.h +++ b/include/gc.h @@ -93,11 +93,16 @@ typedef union { pointer ptr; } ChangeGCVal, *ChangeGCValPtr; -extern _X_EXPORT int dixChangeGC( +extern int ChangeGCXIDs( + ClientPtr /*client*/, + GCPtr /*pGC*/, + BITS32 /*mask*/, + CARD32 * /*pval*/); + +extern _X_EXPORT int ChangeGC( ClientPtr /*client*/, GCPtr /*pGC*/, BITS32 /*mask*/, - CARD32 * /*pval*/, ChangeGCValPtr /*pCGCV*/); extern _X_EXPORT GCPtr CreateGC( diff --git a/include/gcstruct.h b/include/gcstruct.h index 8d9b05575..b9fc5cace 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -59,6 +59,8 @@ SOFTWARE. #include "privates.h" #include <X11/Xprotostr.h> +#define GCAllBits ((1 << (GCLastBit + 1)) - 1) + /* * functions which modify the state of the GC */ |