aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 22:44:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 22:44:58 +0100
commit05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (patch)
tree7eb1bb1a0e4633e77edf9d3d8e3829849303f1cd /nx-X11/programs/Xserver/include
parent96e2556031c8aff62a4650b9cfb814991f5240e1 (diff)
parent06bb154df0a4d6e35885bce6a63057bd8f8636e8 (diff)
downloadnx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.gz
nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.bz2
nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.zip
Merge branch 'uli42-pr/fix_validatestring' into 3.6.x
Attributes GH PR #359: https://github.com/ArcticaProject/nx-libs/pull/359
Diffstat (limited to 'nx-X11/programs/Xserver/include')
-rw-r--r--nx-X11/programs/Xserver/include/xkbfile.h5
-rw-r--r--nx-X11/programs/Xserver/include/xkbsrv.h6
2 files changed, 0 insertions, 11 deletions
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 f0f803370..533a30930 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -985,10 +985,6 @@ extern XkbGeometryPtr XkbLookupNamedGeometry(
Bool * /* shouldFree */
);
-extern char * _XkbDupString(
- char * /* str */
-);
-
extern void XkbConvertCase(
KeySym /* sym */,
KeySym * /* lower */,
@@ -1180,8 +1176,6 @@ extern int _XkbStrCaseCmp(
_XFUNCPROTOEND
-#define XkbAtomGetString(d,s) NameForAtom(s)
-
#endif /* _XKBSRV_H_ */