diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/fb/wfbrename.h | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fb/wfbrename.h')
-rw-r--r-- | xorg-server/fb/wfbrename.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h index dc0528559..73ee510b9 100644 --- a/xorg-server/fb/wfbrename.h +++ b/xorg-server/fb/wfbrename.h @@ -187,12 +187,4 @@ #define fbZeroSegment wfbZeroSegment #define free_pixman_pict wfb_free_pixman_pict #define image_from_pict wfb_image_from_pict -#define xxScrPrivateKey wfbxxScrPrivateKey -#define xxGCPrivateKey wfbxxGCPrivateKey -#define xxColormapPrivateKey wfbxxColormapPrivateKey -#define xxGeneration wfbxxGeneration -#define xxPrintVisuals wfbxxPrintVisuals -#define xxGCFuncs wfbxxGCFuncs -#define xxGCOps wfbxxGCOps -#define xxSetup wfbxxSetup #define composeFunctions wfbComposeFunctions |