From 0ce4425826074b12a58ced432f9d6fb346474737 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 16 Apr 2022 12:20:51 -0700 Subject: XKBgeom.h: Remove XKB_IN_SERVER section The Xserver made its own copy of this file in 2008, and the API's are no longer the same between the server and client forks. Signed-off-by: Alan Coopersmith --- include/X11/extensions/XKBgeom.h | 44 ---------------------------------------- 1 file changed, 44 deletions(-) diff --git a/include/X11/extensions/XKBgeom.h b/include/X11/extensions/XKBgeom.h index 380fa18b..3efbe790 100644 --- a/include/X11/extensions/XKBgeom.h +++ b/include/X11/extensions/XKBgeom.h @@ -29,50 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -#ifdef XKB_IN_SERVER -#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias -#define XkbAddGeomColor SrvXkbAddGeomColor -#define XkbAddGeomDoodad SrvXkbAddGeomDoodad -#define XkbAddGeomKey SrvXkbAddGeomKey -#define XkbAddGeomOutline SrvXkbAddGeomOutline -#define XkbAddGeomOverlay SrvXkbAddGeomOverlay -#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow -#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey -#define XkbAddGeomProperty SrvXkbAddGeomProperty -#define XkbAddGeomRow SrvXkbAddGeomRow -#define XkbAddGeomSection SrvXkbAddGeomSection -#define XkbAddGeomShape SrvXkbAddGeomShape -#define XkbAllocGeomKeyAliases SrvXkbAllocGeomKeyAliases -#define XkbAllocGeomColors SrvXkbAllocGeomColors -#define XkbAllocGeomDoodads SrvXkbAllocGeomDoodads -#define XkbAllocGeomKeys SrvXkbAllocGeomKeys -#define XkbAllocGeomOutlines SrvXkbAllocGeomOutlines -#define XkbAllocGeomPoints SrvXkbAllocGeomPoints -#define XkbAllocGeomProps SrvXkbAllocGeomProps -#define XkbAllocGeomRows SrvXkbAllocGeomRows -#define XkbAllocGeomSectionDoodads SrvXkbAllocGeomSectionDoodads -#define XkbAllocGeomSections SrvXkbAllocGeomSections -#define XkbAllocGeomOverlays SrvXkbAllocGeomOverlays -#define XkbAllocGeomOverlayRows SrvXkbAllocGeomOverlayRows -#define XkbAllocGeomOverlayKeys SrvXkbAllocGeomOverlayKeys -#define XkbAllocGeomShapes SrvXkbAllocGeomShapes -#define XkbAllocGeometry SrvXkbAllocGeometry -#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases -#define XkbFreeGeomColors SrvXkbFreeGeomColors -#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads -#define XkbFreeGeomProperties SrvXkbFreeGeomProperties -#define XkbFreeGeomOverlayKeys SrvXkbFreeGeomOverlayKeys -#define XkbFreeGeomOverlayRows SrvXkbFreeGeomOverlayRows -#define XkbFreeGeomOverlays SrvXkbFreeGeomOverlays -#define XkbFreeGeomKeys SrvXkbFreeGeomKeys -#define XkbFreeGeomRows SrvXkbFreeGeomRows -#define XkbFreeGeomSections SrvXkbFreeGeomSections -#define XkbFreeGeomPoints SrvXkbFreeGeomPoints -#define XkbFreeGeomOutlines SrvXkbFreeGeomOutlines -#define XkbFreeGeomShapes SrvXkbFreeGeomShapes -#define XkbFreeGeometry SrvXkbFreeGeometry -#endif - typedef struct _XkbProperty { char *name; char *value; -- cgit v1.2.1