From 9e29588dd09eec1824b3b49fb9368f22e78ce790 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 15 Jan 2010 15:32:13 +1000
Subject: xkb: remove XkbAtomGetString, replace with NameForAtom.

XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
---
 nx-X11/programs/Xserver/include/xkbfile.h | 5 -----
 nx-X11/programs/Xserver/include/xkbsrv.h  | 2 --
 2 files changed, 7 deletions(-)

(limited to 'nx-X11/programs/Xserver/include')

diff --git a/nx-X11/programs/Xserver/include/xkbfile.h b/nx-X11/programs/Xserver/include/xkbfile.h
index c042ef2ad..e99de6c9c 100644
--- a/nx-X11/programs/Xserver/include/xkbfile.h
+++ b/nx-X11/programs/Xserver/include/xkbfile.h
@@ -236,11 +236,6 @@ extern	Bool	XkbLookupGroupAndLevel(
 
 /***====================================================================***/
 
-extern	char *	XkbAtomGetString(
-    Display *	/* dpy */,
-    Atom 	/* atm */
-);
-
 extern	Atom	XkbInternAtom(
     Display *	/* dpy */,
     char *	/* name */,
diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h
index d5036b6fd..533a30930 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -1176,8 +1176,6 @@ extern	int _XkbStrCaseCmp(
 
 _XFUNCPROTOEND
 
-#define	XkbAtomGetString(d,s)	NameForAtom(s)
-
 #endif /* _XKBSRV_H_ */
 
 
-- 
cgit v1.2.3