Bug 1014976 - Don't define _DEBUG on Windows debug builds, it's implied by -MDd/-MTd, and breaks builds with -MD/-MT. r=bsmedberg

build/autoconf/compiler-opts.m4

@@ -128,7 +128,7 @@ fi
 
 AC_SUBST(MOZ_NO_DEBUG_RTL)
 
-MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG -DTRACING"
+MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -DTRACING"
 MOZ_ARG_WITH_STRING(debug-label,
 [  --with-debug-label=LABELS
                           Define DEBUG_<value> for each comma-separated

config/msvc-stl-wrapper.template.h

@@ -36,13 +36,13 @@
 #  error "STL code can only be used with infallible ::operator new()"
 #endif
 
-#ifdef DEBUG
+#ifdef _DEBUG
 // From
 //   http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx
 // and
 //   http://msdn.microsoft.com/en-us/library/aa985965%28VS.80%29.aspx
 // there appear to be two types of STL container checking.  The
-// former is enabled by -D_DEBUG (which is implied by -DDEBUG), and
+// former is enabled by -D_DEBUG (which is implied by -MDd or -MTd), and
 // looks to be full generation/mutation checked iterators as done by
 // _GLIBCXX_DEBUG.  The latter appears to just be bounds checking, and
 // is enabled by the following macros.  It appears that the _DEBUG