summaryrefslogtreecommitdiff
path: root/src/utils.c
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-03-23 23:28:24 +0200
committerDaniel Stone <daniel@fooishbar.org>2012-03-27 14:09:27 +0100
commit0480f427adcc745c139841a23c80d15a3d44f4db (patch)
tree1ef6513c6d41418c2bf1724dab934b515f5c25a2 /src/utils.c
parent2ac8610fad7236f2ffc3a8507cd846e88de85dc0 (diff)
downloadlibxkbcommon-0480f427adcc745c139841a23c80d15a3d44f4db.tar.gz
libxkbcommon-0480f427adcc745c139841a23c80d15a3d44f4db.tar.bz2
libxkbcommon-0480f427adcc745c139841a23c80d15a3d44f4db.zip
Remove useless stuff from utils
Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: fixed conflicts from strcasecmp, added includes to make filecomp build again]
Diffstat (limited to 'src/utils.c')
-rw-r--r--src/utils.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/utils.c b/src/utils.c
index 095c2d1..a9d59c2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -25,10 +25,13 @@
* software without specific, written prior permission.
\*/
-#include "utils.h"
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include "utils.h"
+#include "XKBcommonint.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
void *
recalloc(void * old, unsigned nOld, unsigned nNew, unsigned itemSize)
@@ -53,7 +56,7 @@ static int outCount = 0;
static char *preMsg = NULL;
static char *prefix = NULL;
-Boolean
+Bool
uSetErrorFile(char *name)
{
if ((errorFile != NULL) && (errorFile != stderr))
@@ -61,7 +64,7 @@ uSetErrorFile(char *name)
fprintf(errorFile, "switching to %s\n", name ? name : "stderr");
fclose(errorFile);
}
- if (name != NullString)
+ if (name != NULL)
errorFile = fopen(name, "w");
else
errorFile = stderr;