From ee048fd6af05b7df690cf172a1ad961b467bf658 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Sun, 13 Sep 2009 13:26:31 -0700
Subject: [PATCH] Bug 431950 - disable scary-but-harmless zlib trace warnings
 in debug builds.  r=bholley

---
 modules/zlib/src/ChangeLog.moz | 3 +++
 modules/zlib/src/zutil.h       | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/modules/zlib/src/ChangeLog.moz b/modules/zlib/src/ChangeLog.moz
index 941c2ac5d6a6..ccc654596dcd 100644
--- a/modules/zlib/src/ChangeLog.moz
+++ b/modules/zlib/src/ChangeLog.moz
@@ -39,3 +39,6 @@ Mozilla.org changes:
 
 - 24 July 2005
   Updated zlib.def with new symbols in zlib version 1.2.3
+
+- 13 September 2009
+  Don't enable zlib's debug output when the Mozilla build is in debug mode (bug 431950)
diff --git a/modules/zlib/src/zutil.h b/modules/zlib/src/zutil.h
index f15580e550c3..991e7e6898ca 100644
--- a/modules/zlib/src/zutil.h
+++ b/modules/zlib/src/zutil.h
@@ -238,6 +238,11 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
    extern void zmemzero OF((Bytef* dest, uInt len));
 #endif
 
+/* Ignore the Mozilla build env's DEBUG unless ZLIB_DEBUG is also set */
+#ifndef ZLIB_DEBUG
+#undef DEBUG
+#endif
+
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include <stdio.h>