diff options
author | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
commit | 3d54338330821a3e60e0f52cce2a9dd1f94f8b5c (patch) | |
tree | e1d61f5f14cf5f26f3cf7094c485a5424f0551ea /nx-X11/programs/Xserver/dix/swaprep.c | |
parent | c646808bcb0fe95e9794409231a9fa8b51990971 (diff) | |
parent | b2145323c189a9c68d475d387fdfac54bcb33c94 (diff) | |
download | nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.gz nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.bz2 nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.zip |
Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into arctica-3.6.x
Attributes GH PR #106: https://github.com/ArcticaProject/nx-libs/pull/106
Diffstat (limited to 'nx-X11/programs/Xserver/dix/swaprep.c')
-rw-r--r-- | nx-X11/programs/Xserver/dix/swaprep.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c index b8f245408..31c823b3a 100644 --- a/nx-X11/programs/Xserver/dix/swaprep.c +++ b/nx-X11/programs/Xserver/dix/swaprep.c @@ -65,11 +65,9 @@ SOFTWARE. static void SwapFontInfo(xQueryFontReply *pr); -#ifndef LBX static void SwapCharInfo(xCharInfo *pInfo); static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs); -#endif /** * Thanks to Jack Palevich for testing and subsequently rewriting all this @@ -391,9 +389,7 @@ SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep) (void)WriteToClient(pClient, size, (char *) pRep); } -#ifndef LBX static -#endif void SwapCharInfo(xCharInfo *pInfo) { @@ -423,9 +419,7 @@ SwapFontInfo(xQueryFontReply *pr) swapl(&pr->nCharInfos, n); } -#ifndef LBX static -#endif void SwapFont(xQueryFontReply *pr, Bool hasGlyphs) { |