diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:57 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:57 +0000 |
| commit | ac8f15d8622a23dd57928f1c40da5ecafbb31492 (patch) | |
| tree | b465a0b386ce699c33c736b3a341a183901f7f17 /src/StrKeysym.c | |
| parent | 917de4a98eeb9a7eafeab7ddd8e1b1ae6aae6514 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/StrKeysym.c')
| -rw-r--r-- | src/StrKeysym.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/StrKeysym.c b/src/StrKeysym.c index 21949b1..e13ee78 100644 --- a/src/StrKeysym.c +++ b/src/StrKeysym.c @@ -24,18 +24,16 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.6 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.8 2003/11/17 22:20:08 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xresource.h> #include <X11/keysymdef.h> - -extern XrmQuark _XrmInternalStringToQuark(); - -typedef unsigned long Signature; +#include "Xresinternal.h" #define NEEDKTABLE #include "ks_tables.h" +#include "Key.h" #ifndef KEYSYMDB #define KEYSYMDB "/usr/lib/X11/XKeysymDB" @@ -46,7 +44,7 @@ static XrmDatabase keysymdb; static XrmQuark Qkeysym[2]; XrmDatabase -_XInitKeysymDB() +_XInitKeysymDB(void) { if (!initialized) { @@ -66,13 +64,8 @@ _XInitKeysymDB() return keysymdb; } -#if NeedFunctionPrototypes -KeySym XStringToKeysym(s) - _Xconst char *s; -#else -KeySym XStringToKeysym(s) - char *s; -#endif +KeySym +XStringToKeysym(_Xconst char *s) { register int i, n; int h; |