~brandonsnider/+junk/chromium-browser.head.daily

« back to all changes in this revision

Viewing changes to debian/patches/disable_dlog_and_dcheck_in_release_builds.patch

  • Committer: Brandon Snider
  • Date: 2011-12-13 21:22:51 UTC
  • Revision ID: brandonjsnider@gmail.com-20111213212251-najkvokx2gtgajjh
refreshed disable_dlog_and_dcheck_in_release_builds.patch and fixed chromium-browser.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
===================================================================
7
7
--- src.orig/base/logging.h
8
8
+++ src/base/logging.h
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
 
 
14
 
 // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
 
9
@@ -451,7 +451,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
15
10
 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
16
11
 // defined.
17
12
 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
18
13
-    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
19
14
+    (!defined(OS_WIN) && defined(NDEBUG))
20
 
 // Used by unit tests.
21
 
 #define LOGGING_IS_OFFICIAL_BUILD
22
 
 
23
 
 // In order to have optimized code for official builds, remove DLOGs and
24
 
 // DCHECKs.
25
 
 #define ENABLE_DLOG 0
26
 
 #define ENABLE_DCHECK 0
27
 
 
 
15
 #define LOGGING_IS_OFFICIAL_BUILD 1
 
16
 #else
 
17
 #define LOGGING_IS_OFFICIAL_BUILD 0