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

Side by Side Diff: Source/config.h

Issue 360353002: Move core/WebCorePrefixMac.h to build/mac/Prefix.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix gn build Created 6 years, 5 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 | « Source/build/mac/Prefix.h ('k') | Source/core/BUILD.gn » ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #define max max 123 #define max max
124 #endif 124 #endif
125 #ifndef min 125 #ifndef min
126 #define min min 126 #define min min
127 #endif 127 #endif
128 128
129 #endif /* OS(WIN) */ 129 #endif /* OS(WIN) */
130 130
131 #ifdef __cplusplus 131 #ifdef __cplusplus
132 132
133 // These undefs match up with defines in WebCorePrefixMac.h for Mac OS X. 133 // These undefs match up with defines in build/mac/Prefix.h for Mac OS X.
134 // Helps us catch if anyone uses new or delete by accident in code and doesn't i nclude "config.h". 134 // Helps us catch if anyone uses new or delete by accident in code and doesn't i nclude "config.h".
135 #undef new 135 #undef new
136 #undef delete 136 #undef delete
137 #include "wtf/FastMalloc.h" 137 #include "wtf/FastMalloc.h"
138 138
139 #include <ciso646> 139 #include <ciso646>
140 140
141 #endif 141 #endif
142 142
143 #if COMPILER(MSVC) 143 #if COMPILER(MSVC)
144 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 144 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
145 #else 145 #else
146 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 146 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
147 #endif 147 #endif
148 148
149 #if OS(LINUX) || OS(ANDROID) || OS(WIN) 149 #if OS(LINUX) || OS(ANDROID) || OS(WIN)
150 #define WTF_USE_HARFBUZZ 1 150 #define WTF_USE_HARFBUZZ 1
151 #endif 151 #endif
OLDNEW
« no previous file with comments | « Source/build/mac/Prefix.h ('k') | Source/core/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698