fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-08 20:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xcup: remove XCup.h library header, split into cup.h

Browse source 
Rename Xcupstr.h to cupproto.h
This commit is contained in:
Peter Hutterer 2009-06-25 11:04:12 +10:00
parent 38daa9d8d9
commit d2574e8804
3 changed files with 15 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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 \

41
Xcup.h → cup.h
View file

@ -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_ */

15
Xcupstr.h → cupproto.h
View file

@ -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_ */