turn on rod's reflow counts in debug and clean up a lot of unused cruft. r=sfraser.

config/mac/DefinesMozilla.h

@@ -28,41 +28,28 @@
 //#define EXPORT_VERSION
 #define US_VERSION
 
-// *** Misc
-//#define NO_DBM		// define this to kill DBM
-//#define NEW_BOOKMARKS
-// Enables us to switch profiling from project preferences
-
-// *** Version
-//#define ALPHA
-//#define BETA
-// Comment out both ALPHA and BETA for the final version
-
-// 98-06-03 pinkerton -- temorary defines to turn on features before they fully land.
+// Cookies/SingleSignon/Wallet
 #define CookieManagement 1
 #define SingleSignon 1
 #define ClientWallet 1
 
-// 98-07-29 pinkerton -- defines to turn on feature. REMOVE WHEN THIS LANDS.
-//#define PRIVACY_POLICIES 1
-
-// 98-08-10 joe -- temporary item to turn on ENDER (html textareas) before it fully lands
-//#define ENDER 1
-
 // 98-09-25 mlm - turn on javascript thread safety
 #define JS_THREADSAFE 1
 
-// 98-10-14 joe -- temporary item to turn on ENDER MIME support before it fully lands
-//#define MOZ_ENDER_MIME 1
-
 #define USE_NSREG 1
 
-//  used to change string class
-//#define USE_STRING2	1
-
 // External DTD support for XML
 #define XML_DTD
 
+//#define MOZ_PERF_METRICS 1		// Uncomment to get metrics in layout, parser and webshell.
+															// You also need to define __TIMESIZE_DOUBLE__ in <timesize.mac.h>
+
+// reflow counters, enabled in debug builds and visible via a pref
+#ifdef DEBUG
+#define MOZ_REFLOW_PERF 1
+#define MOZ_REFLOW_PERF_DSP 1
+#endif
+
 // ***************************************************************************
 //	•	You typically will not need to change things below here
 // ***************************************************************************
@@ -73,25 +60,13 @@
 #define NETSCAPE	1
 #endif
 
-// #define JAVA 	1
 #define OJI		1
 
 #ifdef JAVA
 	#define UNICODE_FONTLIST 1
 #endif
 
-// #define NU_CACHE 1 // uncomment to turn on new memory cache features
-
-//#define CASTED_READ_OBJECT(stream, type, reference) (reference = NULL)
-
-/* Defined in javaStubs prefix files
-#define VERSION_NUMBER "4_0b0"
-#define ZIP_NAME "java"##VERSION_NUMBER
-*/
-
 #define NECKO 1
 
-//#define MOZ_PERF_METRICS 1		// Uncomment to get metrics in layout, parser and webshell.
-															// You also need to define __TIMESIZE_DOUBLE__ in <timesize.mac.h>
 
 #endif /* DefinesMozilla_h_ */