Various logging-related cleanups & reformatting.

base/syslog_logging.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/stack_trace.h"
 #include "base/syslog_logging.h"
 
 #if defined(OS_WIN)
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/win/eventlog_messages.h"
 
 #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>
 #include <ostream>
 #include <string>
 
 namespace logging {
 
 #if defined(OS_WIN)
 
@@ skipping 74 matching lines @@
     case LOG_FATAL:
       priority = 2;
       break;
   }
   syslog(priority, "%s", log_message_.str().c_str());
   closelog();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace logging