| commit | a245bd07a1e59556dc6c967a1c53c439c3dcad9e | [log] [tgz] |
|---|---|---|
| author | wez <[email protected]> | Sun Jun 18 23:26:34 2017 |
| committer | Commit Bot <[email protected]> | Sun Jun 18 23:26:34 2017 |
| tree | 4b02b3cf8f83b377242179780cf51421bc5cfb74 | |
| parent | eb339abb6c31f0f6a02d7b7038031ced69898eea [diff] [blame] |
Various logging-related cleanups & reformatting. These changes were part of the dump-on-DCHECK patch, (see https://codereview.chromium.org/1884023002/) but are really just cleanup/reformatting, so should land separately. They include some minor test and formatting changes. BUG=596231 Review-Url: https://codereview.chromium.org/2712823003 Cr-Commit-Position: refs/heads/master@{#480316}
diff --git a/base/syslog_logging.cc b/base/syslog_logging.cc index 087b4fd..aff90a4 100644 --- a/base/syslog_logging.cc +++ b/base/syslog_logging.cc
@@ -12,7 +12,10 @@ #include <windows.h> #elif defined(OS_LINUX) +// <syslog.h> defines a LOG_WARNING macro that could conflict with +// base::LOG_WARNING. #include <syslog.h> +#undef LOG_WARNING #endif #include <cstring>