Chromium Code Reviews| Index: base/syslog_logging.cc |
| diff --git a/base/syslog_logging.cc b/base/syslog_logging.cc |
| index 087b4fd4543195d14bc38b040e58ec5314436f39..aff90a4e841907eba4b04870a4d7140479c12c68 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> |