diff options
author | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
commit | 958dcdff6d845fcff20a414bd28be8ee2ced8c6c (patch) | |
tree | 3bc998a5af389cd1357dd672d96828573025cd0a /X11/extensions/Xcup.h | |
parent | 9b02c06e9c08d3d537d0a6fed3304b2146d49511 (diff) | |
parent | bc4f49f9a9eccb73bc2c5610295febaf4b14559e (diff) | |
download | vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.gz vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.bz2 vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.zip |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/Xcup.h')
-rw-r--r-- | X11/extensions/Xcup.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/X11/extensions/Xcup.h b/X11/extensions/Xcup.h index b1df039e6..1a909c7af 100644 --- a/X11/extensions/Xcup.h +++ b/X11/extensions/Xcup.h @@ -30,14 +30,7 @@ in this Software without prior written authorization from The Open Group. #define _XCUP_H_ #include <X11/Xfuncproto.h> - -#define X_XcupQueryVersion 0 -#define X_XcupGetReservedColormapEntries 1 -#define X_XcupStoreColors 2 - -#define XcupNumberErrors 0 - -#ifndef _XCUP_SERVER_ +#include <X11/extensions/cup.h> _XFUNCPROTOBEGIN @@ -63,7 +56,5 @@ Status XcupStoreColors( _XFUNCPROTOEND -#endif /* _XCUP_SERVER_ */ - #endif /* _XCUP_H_ */ |