← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/disable_dlog_and_dcheck_in_release_builds.patch

* Merge with chromium-browser.head #645

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable_dlog_and_dcheck_in_release_builds.patch
6
6
===================================================================
7
7
--- src.orig/base/logging.h
8
8
+++ src/base/logging.h
9
 
@@ -382,17 +382,17 @@
10
 
 //   #ifndef NDEBUG
11
 
 //     foo.CheckThatFoo();
12
 
 //   #endif
 
9
@@ -495,17 +495,17 @@
 
10
 #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
 
11
 #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
 
12
 #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
13
13
 
14
14
 // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
15
15
 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
17
17
 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
18
18
-    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
19
19
+    (!defined(OS_WIN) && defined(NDEBUG))
 
20
 // Used by unit tests.
 
21
 #define LOGGING_IS_OFFICIAL_BUILD
 
22
 
20
23
 // In order to have optimized code for official builds, remove DLOGs and
21
24
 // DCHECKs.
22
 
 #define OMIT_DLOG_AND_DCHECK 1
23
 
 #endif
24
 
 
25
 
 #ifdef OMIT_DLOG_AND_DCHECK
26
 
 
27
 
 #define DLOG(severity) \
 
25
 #define ENABLE_DLOG 0
 
26
 #define ENABLE_DCHECK 0
 
27