summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-02-28 21:45:13 +0000
committerwtchang%redhat.com <devnull@localhost>2006-02-28 21:45:13 +0000
commitcabbde8a8b861f114acb38c135a294af20769b84 (patch)
tree996cb8a1499fed57b3aef6d8d332c1e4ead68262
parentc60a27d36979ed3f8d3f288b400b813f17caa531 (diff)
downloadnss-hg-cabbde8a8b861f114acb38c135a294af20769b84.tar.gz
Bugzilla bug 327855: OS2 GCC build should define XP_OS2_EMX for NSPR
headers. Removed a duplicate XP_OS2 definition. r=Peter Weilbacher and Julien Pierre. Tag: MOZILLA_1_8_BRANCH
-rw-r--r--security/coreconf/OS2.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 575fd8b55..a5776937e 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -78,7 +78,7 @@ FILTER = emxexp -o
# GCC for OS/2 currently predefines these, but we don't want them
DEFINES += -Uunix -U__unix -U__unix__
-DEFINES += -DTCPV40HDRS
+DEFINES += -DXP_OS2_EMX -DTCPV40HDRS
ifndef NO_SHARED_LIB
WRAP_MALLOC_LIB =
@@ -240,8 +240,6 @@ else
endif
endif
-DEFINES += -DXP_OS2
-
define MAKE_OBJDIR
if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
endef