Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: Source/config.h

Issue 23691071: OS(ANDROID) should not imply OS(LINUX) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Refactor OS macros to have exclusive priority order Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/web/PopupListBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/config.h
diff --git a/Source/config.h b/Source/config.h
index 2f80e06ff65b7199104bdedd232b0fbb04ceaa5d..378908b38ef354cfc1ffe3c1ee4075a23ac85ec5 100644
--- a/Source/config.h
+++ b/Source/config.h
@@ -49,30 +49,20 @@
/* OS(ANDROID) - Android */
#ifdef ANDROID
#define WTF_OS_ANDROID 1
-#endif
-
/* OS(MACOSX) - Any Darwin-based OS, including Mac OS X and iPhone OS */
-#ifdef __APPLE__
+#elif defined(__APPLE__)
#define WTF_OS_MACOSX 1
-#endif
-
/* OS(FREEBSD) - FreeBSD */
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#define WTF_OS_FREEBSD 1
-#endif
-
/* OS(LINUX) - Linux */
-#ifdef __linux__
+#elif defined(__linux__)
#define WTF_OS_LINUX 1
-#endif
-
/* OS(OPENBSD) - OpenBSD */
-#ifdef __OpenBSD__
+#elif defined(__OpenBSD__)
#define WTF_OS_OPENBSD 1
-#endif
-
/* OS(WIN) - Any version of Windows */
-#if defined(WIN32) || defined(_WIN32)
+#elif defined(WIN32) || defined(_WIN32)
#define WTF_OS_WIN 1
#endif
« no previous file with comments | « no previous file | Source/web/PopupListBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698