pull in relevant headers instead of defining things here.

nsprpub/macbuild/NSPRConfig.h

@@ -16,11 +16,9 @@
  * Reserved.
  */
 
-#define OLDROUTINELOCATIONS 0
+#include "DefinesMac.h"
+#include "DefinesMozilla.h"
 
-#define XP_MAC 1
 #define _PR_NO_PREEMPT 1
 #define _NO_FAST_STRING_INLINES_ 1
 #define FORCE_PR_LOG 1
-#define NSPR20 1
-