diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
| commit | 2eadcf4eb451a125e9fc7c5fc9b4d09024019316 (patch) | |
| tree | bdbda91d988ad3e7d19d4184c2d2930be9d3d26f /src/srvmisc.c | |
| parent | 452889aad6eca008ccba92e98eb8139dccea94d8 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE
Diffstat (limited to 'src/srvmisc.c')
| -rw-r--r-- | src/srvmisc.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/srvmisc.c b/src/srvmisc.c index 9a47333..6eae0f1 100644 --- a/src/srvmisc.c +++ b/src/srvmisc.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.4 2001/10/28 03:32:47 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.5 2003/11/17 22:20:23 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -37,12 +37,7 @@ #include "XKBfileInt.h" Bool -#if NeedFunctionPrototypes XkbWriteToServer(XkbFileInfo *result) -#else -XkbWriteToServer(result) - XkbFileInfo * result; -#endif { XkbDescPtr xkb; Display * dpy; @@ -88,15 +83,7 @@ Display * dpy; } unsigned -#if NeedFunctionPrototypes XkbReadFromServer(Display *dpy,unsigned need,unsigned want,XkbFileInfo *result) -#else -XkbReadFromServer(dpy,need,want,result) - Display * dpy; - unsigned need; - unsigned want; - XkbFileInfo * result; -#endif { unsigned which= need|want; unsigned tmp = 0; @@ -133,13 +120,7 @@ unsigned tmp = 0; } Status -#if NeedFunctionPrototypes XkbChangeKbdDisplay(Display *newDpy,XkbFileInfo *result) -#else -XkbChangeKbdDisplay(newDpy,result) - Display * newDpy; - XkbFileInfo * result; -#endif { register int i; XkbDescPtr xkb; |