summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-04-20 00:39:46 +0000
committerwtchang%redhat.com <devnull@localhost>2006-04-20 00:39:46 +0000
commit362479085ac1fd0923b430f5df9a71580da53b9d (patch)
tree637f08085245ade7f755b3486aa3190e7122107a
parent94a4211e56faba898ed3a823f06fdcf6434d5113 (diff)
downloadnss-hg-362479085ac1fd0923b430f5df9a71580da53b9d.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. a=mkaply for approval1.8.0.3+. Tag: MOZILLA_1_8_0_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 4c965531f..327904b5b 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 =
@@ -253,8 +253,6 @@ else
endif
endif
-DEFINES += -DXP_OS2
-
define MAKE_OBJDIR
if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
endef