diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
commit | a90ee792d96752ad1b71b9ada922fa6afe478c99 (patch) | |
tree | 6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/include/gc.h | |
parent | bc97d4ecc0aa9e1b823565b07282f848700bd11a (diff) |
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/include/gc.h')
-rw-r--r-- | xserver/include/gc.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/xserver/include/gc.h b/xserver/include/gc.h index e75cc5e83..63eecbd66 100644 --- a/xserver/include/gc.h +++ b/xserver/include/gc.h @@ -88,27 +88,21 @@ extern _X_EXPORT void ValidateGC( DrawablePtr /*pDraw*/, GCPtr /*pGC*/); -extern _X_EXPORT int ChangeGC( - GCPtr/*pGC*/, - BITS32 /*mask*/, - XID* /*pval*/); - -extern _X_EXPORT int DoChangeGC( - GCPtr/*pGC*/, - BITS32 /*mask*/, - XID* /*pval*/, - int /*fPointer*/); - typedef union { CARD32 val; 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( |