- minor cleanup

Makefile.defs

@@ -60,9 +60,8 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ )
 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\
 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \
-	 -DUSE_SYNONIM -DVQ_MALLOC \
-	 #-DFAST_LOCK -Di386
-	 #-DEXTRA_DEBUG #-DSTATIC_TM
+	 -DUSE_SYNONIM -DF_MALLOC \
+	 #-DEXTRA_DEBUG 
 	 #-DVQ_MALLOC  -DDBG_LOCK  #-DSTATS
 	 #-DDBG_QM_MALLOC #-DNO_DEBUG
 #-DEXTRA_DEBUG
@@ -93,12 +92,12 @@ MKDEP=gcc -MM $(DEFS)
 MKTAGS=ctags -R .
 
 ifeq ($(mode), release)
-	CFLAGS+=-O9 -funroll-loops  -Wcast-align $(PROFILE) -Winline\
+	CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) -Winline\
 			-malign-double -malign-loops=4
 			#-Wmissing-prototypes \
 	
 ifneq (,$(findstring 3.0, $(CC_VER)))
-	CFLAGS+=-minline-all-stringops \
+	CFLAGS=-minline-all-stringops \
 				-march=athlon \
 				#-mcpu=athlon
 endif
@@ -107,7 +106,7 @@ endif
 	# the executable file, because it's always loaded at a fixed address
 	# -andrei
 else
-	CFLAGS+=-g -Wcast-align -Winline $(PROFILE)
+	CFLAGS=-g -Wcast-align -Winline $(PROFILE)
 	LDFLAGS+=-g -Wl,-E $(PROFILE)
 endif
 

dprint.h

@@ -32,7 +32,6 @@ void dprint (char* format, ...);
 #ifdef NO_DEBUG
 	#define DPrint(fmt, args...)
 #else
-	//#define DPrint(fmt,args...) dprint(fmt, ## args)
 	#define DPrint(fmt,args...) \
 		do{ \
 			if (debug>=DPRINT_LEV){ \