summaryrefslogtreecommitdiff
path: root/src/KeysymStr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/KeysymStr.c')
-rw-r--r--src/KeysymStr.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/KeysymStr.c b/src/KeysymStr.c
index 5a2faf5..0a6a3f2 100644
--- a/src/KeysymStr.c
+++ b/src/KeysymStr.c
@@ -25,7 +25,7 @@ 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/KeysymStr.c,v 3.8 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.10 2003/11/17 22:20:07 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xresource.h>
@@ -37,9 +37,7 @@ typedef unsigned long Signature;
#define NEEDVTABLE
#include "ks_tables.h"
-
-extern XrmDatabase _XInitKeysymDB();
-extern const unsigned char _XkeyTable[];
+#include "Key.h"
typedef struct _GRNData {
@@ -48,9 +46,9 @@ typedef struct _GRNData {
XrmValuePtr value;
} GRNData;
-#if NeedFunctionPrototypes
/*ARGSUSED*/
-static Bool SameValue(
+static Bool
+SameValue(
XrmDatabase* db,
XrmBindingList bindings,
XrmQuarkList quarks,
@@ -58,15 +56,6 @@ static Bool SameValue(
XrmValuePtr value,
XPointer data
)
-#else
-static Bool SameValue(db, bindings, quarks, type, value, data)
- XrmDatabase *db;
- XrmBindingList bindings;
- XrmQuarkList quarks;
- XrmRepresentation *type;
- XrmValuePtr value;
- XPointer data;
-#endif
{
GRNData *gd = (GRNData *)data;