| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2013 Apple Inc. | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2013 Apple Inc. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 #include <sys/param.h> | 127 #include <sys/param.h> |
| 128 #endif | 128 #endif |
| 129 #include <sys/stat.h> | 129 #include <sys/stat.h> |
| 130 #if defined(__APPLE__) | 130 #if defined(__APPLE__) |
| 131 #include <sys/time.h> | 131 #include <sys/time.h> |
| 132 #include <sys/resource.h> | 132 #include <sys/resource.h> |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 #if !PLATFORM(WX) | 135 #if !PLATFORM(WX) |
| 136 #include <CoreFoundation/CoreFoundation.h> | 136 #include <CoreFoundation/CoreFoundation.h> |
| 137 #if PLATFORM(WIN_CAIRO) | |
| 138 #include <ConditionalMacros.h> | |
| 139 #include <windows.h> | |
| 140 #else | |
| 141 | 137 |
| 142 #if OS(WINDOWS) | 138 #if OS(WINDOWS) |
| 143 #if USE(CG) | 139 #if USE(CG) |
| 144 // FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, Cor
eServices header in CoreGraphics | 140 // FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, Cor
eServices header in CoreGraphics |
| 145 // We can remove this once the new ColorSync APIs are available in an internal S
afari SDK. | 141 // We can remove this once the new ColorSync APIs are available in an internal S
afari SDK. |
| 146 #include <ColorSync/ColorSync.h> | 142 #include <ColorSync/ColorSync.h> |
| 147 #ifdef __COLORSYNCDEPRECATED__ | 143 #ifdef __COLORSYNCDEPRECATED__ |
| 148 #define COREGRAPHICS_INCLUDES_CORESERVICES_HEADER | 144 #define COREGRAPHICS_INCLUDES_CORESERVICES_HEADER |
| 149 #define OBSOLETE_COLORSYNC_API | 145 #define OBSOLETE_COLORSYNC_API |
| 150 #endif | 146 #endif |
| 151 #endif | 147 #endif |
| 152 #if USE(CFNETWORK) | 148 #if USE(CFNETWORK) |
| 153 /* Windows doesn't include CFNetwork.h via CoreServices.h, so we do | 149 /* Windows doesn't include CFNetwork.h via CoreServices.h, so we do |
| 154 it explicitly here to make Windows more consistent with Mac. */ | 150 it explicitly here to make Windows more consistent with Mac. */ |
| 155 #include <CFNetwork/CFNetwork.h> | 151 #include <CFNetwork/CFNetwork.h> |
| 156 #endif | 152 #endif |
| 157 #include <windows.h> | 153 #include <windows.h> |
| 158 #else | 154 #else |
| 159 #if !PLATFORM(IOS) | 155 #if !PLATFORM(IOS) |
| 160 #include <CoreServices/CoreServices.h> | 156 #include <CoreServices/CoreServices.h> |
| 161 #endif // !PLATFORM(IOS) | 157 #endif // !PLATFORM(IOS) |
| 162 #endif // OS(WINDOWS) | 158 #endif // OS(WINDOWS) |
| 163 | 159 |
| 164 #endif | |
| 165 #endif // !PLATFORM(WX) | 160 #endif // !PLATFORM(WX) |
| 166 | 161 |
| 167 #ifdef __OBJC__ | 162 #ifdef __OBJC__ |
| 168 #if PLATFORM(IOS) | 163 #if PLATFORM(IOS) |
| 169 #import <Foundation/Foundation.h> | 164 #import <Foundation/Foundation.h> |
| 170 #else | 165 #else |
| 171 #import <Cocoa/Cocoa.h> | 166 #import <Cocoa/Cocoa.h> |
| 172 #endif // PLATFORM(IOS) | 167 #endif // PLATFORM(IOS) |
| 173 #endif | 168 #endif |
| 174 | 169 |
| 175 #ifdef __cplusplus | 170 #ifdef __cplusplus |
| 176 #define new ("if you use new/delete make sure to include config.h at the top of
the file"()) | 171 #define new ("if you use new/delete make sure to include config.h at the top of
the file"()) |
| 177 #define delete ("if you use new/delete make sure to include config.h at the top
of the file"()) | 172 #define delete ("if you use new/delete make sure to include config.h at the top
of the file"()) |
| 178 #endif | 173 #endif |
| 179 | 174 |
| 180 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| | 175 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| |
| 181 * to allow C++ code that expects exceptions to build. These definitions | 176 * to allow C++ code that expects exceptions to build. These definitions |
| 182 * interfere with Objective-C++ uses of Objective-C exception handlers, which | 177 * interfere with Objective-C++ uses of Objective-C exception handlers, which |
| 183 * use |@try| and |@catch|. As a workaround, undefine these macros. */ | 178 * use |@try| and |@catch|. As a workaround, undefine these macros. */ |
| 184 #ifdef __OBJC__ | 179 #ifdef __OBJC__ |
| 185 #undef try | 180 #undef try |
| 186 #undef catch | 181 #undef catch |
| 187 #endif | 182 #endif |
| 188 | 183 |
| OLD | NEW |