diff options
| author | Jed Davis <jld@mozilla.com> | 2015-11-06 09:14:27 +0900 |
|---|---|---|
| committer | Jed Davis <jld@mozilla.com> | 2015-11-06 09:14:27 +0900 |
| commit | 822a003484f4d98c9fa22cad0c6c3d1a1ac479ba (patch) | |
| tree | ed14195a54e8b05660f04758b360338b7d967d47 /coreconf/WIN32.mk | |
| parent | 66e06d54b0625570deda61ff80b1749180873882 (diff) | |
| download | nss-hg-822a003484f4d98c9fa22cad0c6c3d1a1ac479ba.tar.gz | |
Bug 1220016 - Don't change the definedness of _DEBUG on Windows builds.
The compiler already sets _DEBUG appropriately for the runtime library
in use. This patch also removes the workaround of forcing C++ code to
be built for the debug RTL regardless of the USE_DEBUG_RTL setting,
and fixes a warning/error exposed by that.
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 0339f62fe..10e7b52c0 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -113,14 +113,14 @@ ifdef NS_USE_GCC else OPTIMIZER += -O2 endif - DEFINES += -UDEBUG -U_DEBUG -DNDEBUG + DEFINES += -UDEBUG -DNDEBUG else OPTIMIZER += -g NULLSTRING := SPACE := $(NULLSTRING) # end of the line USERNAME := $(subst $(SPACE),_,$(USERNAME)) USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) endif else # !NS_USE_GCC OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ @@ -165,7 +165,7 @@ else # !NS_USE_GCC else OPTIMIZER += -O2 endif - DEFINES += -UDEBUG -U_DEBUG -DNDEBUG + DEFINES += -UDEBUG -DNDEBUG DLLFLAGS += -OUT:$@ ifdef MOZ_DEBUG_SYMBOLS ifdef MOZ_DEBUG_FLAGS @@ -182,7 +182,7 @@ else # !NS_USE_GCC SPACE := $(NULLSTRING) # end of the line USERNAME := $(subst $(SPACE),_,$(USERNAME)) USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) DLLFLAGS += -DEBUG -OUT:$@ LDFLAGS += -DEBUG ifeq ($(_MSC_VER),$(_MSC_VER_6)) |