diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-25 11:04:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:29:45 +1000 |
| commit | d2574e8804a204653bda1786c1ece3437f7901a2 (patch) | |
| tree | 62491ecd6562cabc6ed5e1905cebfe08fbcdc32a | |
| parent | 38daa9d8d9d86f3b9df12dd5032959822b7c0a45 (diff) | |
| download | xorg-proto-xextproto-d2574e8804a204653bda1786c1ece3437f7901a2.tar.gz | |
Xcup: remove XCup.h library header, split into cup.h
Rename Xcupstr.h to cupproto.h
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | cup.h (renamed from Xcup.h) | 41 | ||||
| -rw-r--r-- | cupproto.h (renamed from Xcupstr.h) | 15 |
3 files changed, 15 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am index 32b1295..c94052d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,8 +22,8 @@ xext_HEADERS = \ syncstr.h \ ag.h \ agproto.h \ - Xcup.h \ - Xcupstr.h \ + cup.h \ + cupproto.h \ Xdbe.h \ Xdbeproto.h \ EVI.h \ @@ -26,44 +26,15 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86$ */ -#ifndef _XCUP_H_ -#define _XCUP_H_ +#ifndef _CUP_H_ +#define _CUP_H_ -#include <X11/Xfuncproto.h> +#define XCUPNAME "TOG-CUP" -#define X_XcupQueryVersion 0 -#define X_XcupGetReservedColormapEntries 1 -#define X_XcupStoreColors 2 +#define XCUP_MAJOR_VERSION 1 /* current version numbers */ +#define XCUP_MINOR_VERSION 0 #define XcupNumberErrors 0 -#ifndef _XCUP_SERVER_ - -_XFUNCPROTOBEGIN - -Bool XcupQueryVersion( - Display* /* dpy */, - int* /* major_version */, - int* /* minor_version */ -); - -Status XcupGetReservedColormapEntries( - Display* /* dpy */, - int /* screen */, - XColor** /* colors_out */, - int* /* ncolors */ -); - -Status XcupStoreColors( - Display* /* dpy */, - Colormap /* colormap */, - XColor* /* colors */, - int /* ncolors */ -); - -_XFUNCPROTOEND - -#endif /* _XCUP_SERVER_ */ - -#endif /* _XCUP_H_ */ +#endif /* _CUP_H_ */ @@ -27,15 +27,14 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/include/extensions/Xcupstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */ -#ifndef _XCUPSTR_H_ /* { */ -#define _XCUPSTR_H_ +#ifndef _XCUPPROTO_H_ /* { */ +#define _XCUPPROTO_H_ -#include <X11/extensions/Xcup.h> +#include <X11/extensions/cup.h> -#define XCUPNAME "TOG-CUP" - -#define XCUP_MAJOR_VERSION 1 /* current version numbers */ -#define XCUP_MINOR_VERSION 0 +#define X_XcupQueryVersion 0 +#define X_XcupGetReservedColormapEntries 1 +#define X_XcupStoreColors 2 typedef struct _XcupQueryVersion { CARD8 reqType; /* always XcupReqCode */ @@ -105,5 +104,5 @@ typedef struct { } xXcupStoreColorsReply; #define sz_xXcupStoreColorsReply 32 -#endif /* } _XCUPSTR_H_ */ +#endif /* } _XCUPPROTO_H_ */ |