diff options
| author | sfraser%netscape.com <devnull@localhost> | 2002-01-24 23:40:48 +0000 |
|---|---|---|
| committer | sfraser%netscape.com <devnull@localhost> | 2002-01-24 23:40:48 +0000 |
| commit | b646b54944cd672821e78cbde7bfc1d353bd11ce (patch) | |
| tree | 2373afa0c1f88950f38e8c7234e1d2c663ed51d8 | |
| parent | b9eb12d1a80af71bd8bd5c55eb0383c599ee9b53 (diff) | |
| download | nspr-hg-b646b54944cd672821e78cbde7bfc1d353bd11ce.tar.gz | |
Fixing bug 119329 -- make NSPR use tree-wide prefix files on Mac, so that we get the same traceback table and other compiler settings as the other projects. r=pinkerton, r/a=wtc
| -rw-r--r-- | macbuild/NSPR.Debug.Prefix | 1 | ||||
| -rw-r--r-- | macbuild/NSPR.Prefix | 11 | ||||
| -rw-r--r-- | macbuild/NSPRCarbon.Prefix | 7 | ||||
| -rw-r--r-- | macbuild/NSPRCarbonDebug.Prefix | 10 | ||||
| -rw-r--r-- | macbuild/NSPRConfig.h | 1 | ||||
| -rw-r--r-- | macbuild/NSPRDebug.Prefix | 7 |
6 files changed, 22 insertions, 15 deletions
diff --git a/macbuild/NSPR.Debug.Prefix b/macbuild/NSPR.Debug.Prefix deleted file mode 100644 index ae6233ee..00000000 --- a/macbuild/NSPR.Debug.Prefix +++ /dev/null @@ -1 +0,0 @@ -//
// NSPR.Prefix
//
// Global prefix file for the debug NSPR project.
//
//
#define DEBUG 1
#include "NSPRConfig.h"
\ No newline at end of file diff --git a/macbuild/NSPR.Prefix b/macbuild/NSPR.Prefix index a3947318..f9683b50 100644 --- a/macbuild/NSPR.Prefix +++ b/macbuild/NSPR.Prefix @@ -1 +1,10 @@ -//
// NSPR.Prefix
//
// Global prefix file for the non-debug NSPR project.
//
//
#include "NSPRConfig.h"
\ No newline at end of file +// +// NSPR.Prefix +// +// Global prefix file for the non-debug NSPR project. +// +// + + +#include "MacPrefix.h" +#include "NSPRConfig.h" diff --git a/macbuild/NSPRCarbon.Prefix b/macbuild/NSPRCarbon.Prefix index d36f5663..cb70b847 100644 --- a/macbuild/NSPRCarbon.Prefix +++ b/macbuild/NSPRCarbon.Prefix @@ -1,11 +1,10 @@ // -// NSPR.Prefix +// NSPRCarbon.Prefix // -// Global prefix file for the non-debug NSPR project. +// Global prefix file for the non-debug Carbon NSPR project. // // +#include "MacPrefix.h" #include "NSPRConfig.h" - -#define TARGET_CARBON 1 diff --git a/macbuild/NSPRCarbonDebug.Prefix b/macbuild/NSPRCarbonDebug.Prefix index 4a67d9ef..c758898e 100644 --- a/macbuild/NSPRCarbonDebug.Prefix +++ b/macbuild/NSPRCarbonDebug.Prefix @@ -1,12 +1,12 @@ // -// NSPR.Prefix +// NSPRCarbonDebug.Prefix // -// Global prefix file for the debug NSPR project. +// Global prefix file for the Carbon debug NSPR project. // // -#define DEBUG 1 -#define DEVELOPER_DEBUG 1 +#include "MacPrefix_debug.h" #include "NSPRConfig.h" -#define TARGET_CARBON 1 + +#define DEVELOPER_DEBUG 1 diff --git a/macbuild/NSPRConfig.h b/macbuild/NSPRConfig.h index 4f2adf89..956a178d 100644 --- a/macbuild/NSPRConfig.h +++ b/macbuild/NSPRConfig.h @@ -34,7 +34,6 @@ #define OLDROUTINELOCATIONS 0 -#define XP_MAC 1 #define _PR_NO_PREEMPT 1 #define _NO_FAST_STRING_INLINES_ 1 #define FORCE_PR_LOG 1 diff --git a/macbuild/NSPRDebug.Prefix b/macbuild/NSPRDebug.Prefix index a656aa49..fb35702e 100644 --- a/macbuild/NSPRDebug.Prefix +++ b/macbuild/NSPRDebug.Prefix @@ -1,11 +1,12 @@ // -// NSPR.Prefix +// NSPRDebug.Prefix // // Global prefix file for the debug NSPR project. // // -#define DEBUG 1 +#include "MacPrefix_debug.h" +#include "NSPRConfig.h" + #define DEVELOPER_DEBUG 1 -#include "NSPRConfig.h"
\ No newline at end of file |