From 2fb179f86b0f9ecb7876759b87f9c64634a3f114 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 25 Jul 2009 13:45:56 +0000
Subject: Added libXfont-1.4.0.tar.gz.

---
 libXfont/src/bitmap/bdfutils.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libXfont/src/bitmap/bdfutils.c')

diff --git a/libXfont/src/bitmap/bdfutils.c b/libXfont/src/bitmap/bdfutils.c
index a0c5ae949..17596c323 100644
--- a/libXfont/src/bitmap/bdfutils.c
+++ b/libXfont/src/bitmap/bdfutils.c
@@ -55,11 +55,9 @@ from The Open Group.
 #include <config.h>
 #endif
 
-#ifndef FONTMODULE
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
-#endif
 
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontstruct.h>
@@ -176,7 +174,7 @@ bdfGetPropertyValue(char *s)
     }
     /* quoted string: strip outer quotes and undouble inner quotes */
     s++;
-    pp = p = (char *) xalloc((unsigned) strlen(s) + 1);
+    pp = p = malloc((unsigned) strlen(s) + 1);
     if (pp == NULL) {
   bdfError("Couldn't allocate property value string (%d)\n", strlen(s) + 1);
   return None;
@@ -186,7 +184,7 @@ bdfGetPropertyValue(char *s)
 	    if (*(s + 1) != '"') {
 		*p++ = 0;
 		atom = bdfForceMakeAtom(pp, NULL);
-		xfree(pp);
+		free(pp);
 		return atom;
 	    } else {
 		s++;
@@ -194,7 +192,7 @@ bdfGetPropertyValue(char *s)
 	}
 	*p++ = *s++;
     }
-    xfree (pp);
+    free (pp);
     bdfError("unterminated quoted string property: %s\n", (pointer) orig_s);
     return None;
 }
-- 
cgit v1.2.3