reverted some OS2 related glitches that where missed during a merge with

    XFree86.
17. Fixed Freetype2 compile glitches with different versions of freetype.
    The build has been tested with Freetyp 2.1.4 and 2.1.7 (Egbert Eich).
16. Changed default font renderer for TrueType that is loaded by the
    Xserver to freetype (Egbert Eich).
15. Removed dependecy of freetype Xserver module into freetype internals
    (Keith Packard).
14. Flagged mailing addresses that still need to be decided upon with &&&&&
    to allow for easy tracking (Egbert Eich).
13. Fixed keyboard rate setting thru ioctls on linux (Egbert Eich).

1 files changed, 5 insertions, 7 deletions

diff --git a/main.c b/main.c
index 5a95943..69eab75 100644
--- a/main.c
+++ b/main.c
@@ -56,12 +56,10 @@ int	_debugmask;
 #endif
 
 /* #define DEBUG_DUMP */
-#if 0
 #ifdef DEBUG_DUMP
-#define DBG_PRINT(args...)   fprintf(args)
+#define DBG_PRINT(file, fmt, args)   fprintf(file, fmt, args)
 #else
-#define DBG_PRINT(args...)   /* empty */
-#endif
+#define DBG_PRINT(file, fmt, args)   /* empty */
 #endif
 
 #define DASH_INC_PRE    "#include \""
@@ -492,7 +490,7 @@ main(int argc, char *argv[])
 	 * now peruse through the list of files.
 	 */
 	for(fp=filelist; *fp; fp++) {
-		/* DBG_PRINT(stderr,"file: %s\n",*fp); */
+		DBG_PRINT(stderr,"file: %s\n",*fp);
 		filecontent = getfile(*fp);
 		setfile_cmdinc(filecontent, cmdinc_count, cmdinc_list);
 		ip = newinclude(*fp, (char *)NULL);
@@ -614,7 +612,7 @@ char *getnextline(struct filepointer *filep)
 		char *buf = filep->cmdinc_list[2 * filep->cmdinc_line + 1];
 		filep->cmdinc_line++;
 		sprintf(buf,"%s%s%s",DASH_INC_PRE,inc,DASH_INC_POST);
-		/* DBG_PRINT(stderr,"%s\n",buf); */
+		DBG_PRINT(stderr,"%s\n",buf);
 		return(buf);
 	}
 
@@ -719,7 +717,7 @@ done:
 	filep->f_line = lineno;
 #ifdef DEBUG_DUMP
 	if (bol)
-		/* DBG_PRINT(stderr,"%s\n",bol); */
+		DBG_PRINT(stderr,"%s\n",bol);
 #endif
 	return(bol);
 }