[PATCH] fontmisc.h

The latest CVS can't compile bdfread.c
Attached is a patch to make it work on gcc version 2.95.3 20010315.

gcc -c -ansi -Wall -Wpointer-arith -Wstrict-prototypes 
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls 
-Wnested-externs -Wundef  -I../../../include/fonts -I../include 
-I../../.. -I../../../exports/include   -Dlinux -D__i386__ 
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE 
-D_SVID_SOURCE  -D_GNU_SOURCE   -DFUNCPROTO=15 -DNARROWPROTO   -DBDFFORMAT 
-DPCFFORMAT -DSNFFORMAT  -O2 -fno-strength-reduce   bdfread.c -o 
unshared/bdfread.o
...
bdfread.c:482: parse error before `;'
bdfread.c:291: label `BAILOUT' used but not defined
bdfread.c: At top level:
bdfread.c:490: parse error before `->'
bdfread.c:491: warning: type defaults to `int' in declaration of `i'
bdfread.c:491: warning: data definition has no type or storage class
bdfread.c:492: parse error before `for'
bdfread.c:512: parse error before `->'
make[4]: *** [bdfread.o] Error 1
make[4]: Leaving directory `/v6/src2/xfree86/xc/lib/font/bitmap'


Thanks,
Jeff

--- xfree86/xc/lib/font/include/fontmisc.h.org	Fri Jan 28 14:07:38 2005
+++ xfree86/xc/lib/font/include/fontmisc.h	Fri Jan 28 14:07:41 2005
@@ -93,8 +93,7 @@
  #else
  #define xalloc(n)     Xllalloc((unsigned long long)n)
  #define xrealloc(p,n) Xllrealloc((pointer)p, (unsigned long long)n)
-#define xcalloc(n,s)  Xllcalloc(((unsigned long long)n) *
-                                 ((unsigned long long)s))
+#define xcalloc(n,s)  Xllcalloc(((unsigned long long)n) * ((unsigned long long)s))
  #endif
  #define xfree(p)      Xfree((pointer)p)
  #endif