From 23edcff7a92d42898f86ab7d08e518d16f31c492 Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Mon, 25 May 2015 10:45:43 +0200
Subject: [PATCH] Move base/logging.* to rtc_base_approved.

BUG=
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/47299004

Cr-Commit-Position: refs/heads/master@{#9272}
---
 webrtc/base/BUILD.gn   | 4 ++--
 webrtc/base/base.gyp   | 6 ++++--
 webrtc/base/logging.cc | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index f4c663f9c1..d755bb736e 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -158,6 +158,8 @@ static_library("rtc_base_approved") {
     sources += [
       "basictypes.h",
       "constructormagic.h",
+      "logging.cc",
+      "logging.h",
     ]
   }
 }
@@ -362,8 +364,6 @@ static_library("rtc_base") {
       "httpserver.h",
       "json.cc",
       "json.h",
-      "logging.cc",
-      "logging.h",
       "mathutils.h",
       "multipart.cc",
       "multipart.h",
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index b81e48d5d1..cc1ebf43da 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -53,6 +53,8 @@
         'event_tracer.h',
         'exp_filter.cc',
         'exp_filter.h',
+        'logging.cc',
+        'logging.h',
         'md5.cc',
         'md5.h',
         'md5digest.cc',
@@ -84,6 +86,8 @@
           'sources!': [
             'basictypes.h',
             'constructormagic.h',
+            'logging.cc',
+            'logging.h',
           ],
         }, {
           'sources!': [
@@ -184,8 +188,6 @@
         'linuxfdwalk.c',
         'linuxfdwalk.h',
         'linked_ptr.h',
-        'logging.cc',
-        'logging.h',
         'macasyncsocket.cc',
         'macasyncsocket.h',
         'maccocoasocketserver.h',
diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc
index ea7c0ff00f..f5bcd68af1 100644
--- a/webrtc/base/logging.cc
+++ b/webrtc/base/logging.cc
@@ -9,7 +9,9 @@
  */
 
 #if defined(WEBRTC_WIN)
+#if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #define snprintf _snprintf
 #undef ERROR  // wingdi.h