commit e062385dc7a75bd8b91a5592fd862b2ad5ce760e
author Mirko Bonadei <mbonadei@webrtc.org> Thu Feb 01 11:17:40 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Feb 01 11:22:51 2018 +0000
tree d957b68a841f6b36d887d2d493aeea1f2b64cb7e
parent 06c944f0353d1885d4a1661a16a20e907f6e9c0b

Avoid to unconditionally include rtc_base/win32.h.

This CL adds #error to spot where rtc_base/win32.h is unconditionally
included and fixes all the places where it happens.

Bug: webrtc:8814
Change-Id: I3c005acf2cdb58a51f1bcaa4acaeebd272c56660
Reviewed-on: https://webrtc-review.googlesource.com/46060
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21840}

rtc_base/win32.h

diff --git a/rtc_base/win32.h b/rtc_base/win32.h
index 0cbc412..78f66a7 100644
--- a/rtc_base/win32.h
+++ b/rtc_base/win32.h
@@ -11,7 +11,9 @@
 #ifndef RTC_BASE_WIN32_H_
 #define RTC_BASE_WIN32_H_
 
-#if defined(WEBRTC_WIN)
+#ifndef WEBRTC_WIN
+#error "Only #include this header in Windows builds"
+#endif
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -83,5 +85,4 @@
 
 }  // namespace rtc
 
-#endif  // WEBRTC_WIN
 #endif  // RTC_BASE_WIN32_H_