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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/web/PopupListBox.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc. 2 * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * Copyright (C) 2007-2009 Torch Mobile, Inc. 4 * Copyright (C) 2007-2009 Torch Mobile, Inc.
5 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved. 5 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #define USE(WTF_FEATURE) (defined WTF_USE_##WTF_FEATURE && WTF_USE_##WTF_FEATUR E) 42 #define USE(WTF_FEATURE) (defined WTF_USE_##WTF_FEATURE && WTF_USE_##WTF_FEATUR E)
43 /* ENABLE() - turn on a specific feature of WebKit */ 43 /* ENABLE() - turn on a specific feature of WebKit */
44 #define ENABLE(WTF_FEATURE) (defined ENABLE_##WTF_FEATURE && ENABLE_##WTF_FEATU RE) 44 #define ENABLE(WTF_FEATURE) (defined ENABLE_##WTF_FEATURE && ENABLE_##WTF_FEATU RE)
45 45
46 /* ==== OS() - underlying operating system; only to be used for mandated low-lev el services like 46 /* ==== OS() - underlying operating system; only to be used for mandated low-lev el services like
47 virtual memory, not to choose a GUI toolkit ==== */ 47 virtual memory, not to choose a GUI toolkit ==== */
48 48
49 /* OS(ANDROID) - Android */ 49 /* OS(ANDROID) - Android */
50 #ifdef ANDROID 50 #ifdef ANDROID
51 #define WTF_OS_ANDROID 1 51 #define WTF_OS_ANDROID 1
52 #endif
53
54 /* OS(MACOSX) - Any Darwin-based OS, including Mac OS X and iPhone OS */ 52 /* OS(MACOSX) - Any Darwin-based OS, including Mac OS X and iPhone OS */
55 #ifdef __APPLE__ 53 #elif defined(__APPLE__)
56 #define WTF_OS_MACOSX 1 54 #define WTF_OS_MACOSX 1
57 #endif
58
59 /* OS(FREEBSD) - FreeBSD */ 55 /* OS(FREEBSD) - FreeBSD */
60 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__ ) 56 #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel __)
61 #define WTF_OS_FREEBSD 1 57 #define WTF_OS_FREEBSD 1
62 #endif
63
64 /* OS(LINUX) - Linux */ 58 /* OS(LINUX) - Linux */
65 #ifdef __linux__ 59 #elif defined(__linux__)
66 #define WTF_OS_LINUX 1 60 #define WTF_OS_LINUX 1
67 #endif
68
69 /* OS(OPENBSD) - OpenBSD */ 61 /* OS(OPENBSD) - OpenBSD */
70 #ifdef __OpenBSD__ 62 #elif defined(__OpenBSD__)
71 #define WTF_OS_OPENBSD 1 63 #define WTF_OS_OPENBSD 1
72 #endif
73
74 /* OS(WIN) - Any version of Windows */ 64 /* OS(WIN) - Any version of Windows */
75 #if defined(WIN32) || defined(_WIN32) 65 #elif defined(WIN32) || defined(_WIN32)
76 #define WTF_OS_WIN 1 66 #define WTF_OS_WIN 1
77 #endif 67 #endif
78 68
79 /* OS(POSIX) - Any Unix-like system */ 69 /* OS(POSIX) - Any Unix-like system */
80 #if OS(ANDROID) \ 70 #if OS(ANDROID) \
81 || OS(MACOSX) \ 71 || OS(MACOSX) \
82 || OS(FREEBSD) \ 72 || OS(FREEBSD) \
83 || OS(LINUX) \ 73 || OS(LINUX) \
84 || OS(OPENBSD) \ 74 || OS(OPENBSD) \
85 || defined(unix) \ 75 || defined(unix) \
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 167 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
178 #endif 168 #endif
179 169
180 #ifndef __STDC_FORMAT_MACROS 170 #ifndef __STDC_FORMAT_MACROS
181 #define __STDC_FORMAT_MACROS 1 171 #define __STDC_FORMAT_MACROS 1
182 #endif 172 #endif
183 173
184 #if OS(LINUX) || OS(ANDROID) 174 #if OS(LINUX) || OS(ANDROID)
185 #define WTF_USE_HARFBUZZ 1 175 #define WTF_USE_HARFBUZZ 1
186 #endif 176 #endif
OLDNEW
« 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