Merged NSPRPUB_CLIENT_BRANCH onto the trunk.

2001-05-12 06:46:01 +00:00 · 2001-05-12 06:46:01 +00:00 · 6a7d775b17
--- a/nsprpub/macbuild/NSPR20PPC.mcp
+++ b/nsprpub/macbuild/NSPR20PPC.mcp
--- a/nsprpub/macbuild/NSPRCarbon.Prefix
+++ b/nsprpub/macbuild/NSPRCarbon.Prefix
@ -0,0 +1,11 @@
+//
+//	NSPR.Prefix
+//
+// Global prefix file for the non-debug NSPR project.
+//
+//
+
+
+#include "NSPRConfig.h"
+
+#define TARGET_CARBON 1
--- a/nsprpub/macbuild/NSPRCarbonDebug.Prefix
+++ b/nsprpub/macbuild/NSPRCarbonDebug.Prefix
@ -0,0 +1,12 @@
+//
+//	NSPR.Prefix
+//
+// Global prefix file for the debug NSPR project.
+//
+//
+
+
+#define DEBUG 1
+#define DEVELOPER_DEBUG 1
+#include "NSPRConfig.h"
+#define TARGET_CARBON 1