OLD | NEW |
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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 WebCorePrefixMac.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" | |
138 | |
139 #include <ciso646> | 137 #include <ciso646> |
| 138 #include <cstddef> |
140 | 139 |
141 #endif | 140 #endif |
142 | 141 |
143 #if COMPILER(MSVC) | 142 #if COMPILER(MSVC) |
144 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 | 143 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 |
145 #else | 144 #else |
146 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 | 145 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 |
147 #endif | 146 #endif |
148 | 147 |
149 #if OS(LINUX) || OS(ANDROID) || OS(WIN) | 148 #if OS(LINUX) || OS(ANDROID) || OS(WIN) |
150 #define WTF_USE_HARFBUZZ 1 | 149 #define WTF_USE_HARFBUZZ 1 |
151 #endif | 150 #endif |
OLD | NEW |