Commit 5983a4e69d8f7ee85f6726b403b4bcc236c8d8b1
2009-04-16T20:01:13
Scale back global variables Some of the global variables were either not used anymore or only used in the listing code.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index e509b96..5b4f552 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -144,6 +144,9 @@ static char **mapOnly;
static Listing *list = NULL;
+static unsigned verboseLevel;
+static unsigned dirsToStrip;
+
/***====================================================================***/
int
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index e9d5f47..c45918d 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -113,7 +113,6 @@ typedef struct _ParseCommon
#define CreateKeyNames(x) ((x)->flags&AutoKeyNames)
extern unsigned warningLevel;
-extern unsigned optionalParts;
typedef struct _IncludeStmt
{
@@ -367,10 +366,6 @@ CompileSymbols(XkbFile *file, XkbcDescPtr xkb, unsigned merge);
#define WantFullNames (1<<3)
#define ListRecursive (1<<4)
-extern char *rootDir;
-extern unsigned verboseLevel;
-extern unsigned dirsToStrip;
-
extern Bool AddListing(char * /* file */ ,
char * /* map */
);