diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/hw/xnest/XNGC.h | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/hw/xnest/XNGC.h')
| -rw-r--r-- | xorg-server/hw/xnest/XNGC.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xnest/XNGC.h b/xorg-server/hw/xnest/XNGC.h index c4a6cef77..c7c25e426 100644 --- a/xorg-server/hw/xnest/XNGC.h +++ b/xorg-server/hw/xnest/XNGC.h @@ -18,10 +18,11 @@ is" without express or implied warranty. /* This file uses the GC definition form Xlib.h as XlibGC. */ typedef struct { - XlibGC gc; + XlibGC gc; } xnestPrivGC; extern DevPrivateKeyRec xnestGCPrivateKeyRec; + #define xnestGCPrivateKey (&xnestGCPrivateKeyRec) #define xnestGCPriv(pGC) ((xnestPrivGC *) \ @@ -39,4 +40,4 @@ void xnestDestroyClip(GCPtr pGC); void xnestDestroyClipHelper(GCPtr pGC); void xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc); -#endif /* XNESTGC_H */ +#endif /* XNESTGC_H */ |