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 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 // If we don't define these, they get defined in windef.h. | 40 // If we don't define these, they get defined in windef.h. |
41 // We want to use std::min and std::max. | 41 // We want to use std::min and std::max. |
42 #ifndef max | 42 #ifndef max |
43 #define max max | 43 #define max max |
44 #endif | 44 #endif |
45 #ifndef min | 45 #ifndef min |
46 #define min min | 46 #define min min |
47 #endif | 47 #endif |
48 | 48 |
49 // CURL needs winsock, so don't prevent inclusion of it | |
50 #if !USE(CURL) | |
51 #ifndef _WINSOCKAPI_ | 49 #ifndef _WINSOCKAPI_ |
52 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h | 50 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h |
53 #endif | 51 #endif |
54 #endif | |
55 | 52 |
56 #endif /* OS(WINDOWS) */ | 53 #endif /* OS(WINDOWS) */ |
57 | 54 |
58 #ifdef __cplusplus | 55 #ifdef __cplusplus |
59 | 56 |
60 // These undefs match up with defines in WebCorePrefix.h for Mac OS X. | 57 // These undefs match up with defines in WebCorePrefix.h for Mac OS X. |
61 // Helps us catch if anyone uses new or delete by accident in code and doesn't i
nclude "config.h". | 58 // Helps us catch if anyone uses new or delete by accident in code and doesn't i
nclude "config.h". |
62 #undef new | 59 #undef new |
63 #undef delete | 60 #undef delete |
64 #include <wtf/FastMalloc.h> | 61 #include <wtf/FastMalloc.h> |
65 | 62 |
66 #include <ciso646> | 63 #include <ciso646> |
67 | 64 |
68 #endif | 65 #endif |
69 | 66 |
70 #if COMPILER(MSVC) | 67 #if COMPILER(MSVC) |
71 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 | 68 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1 |
72 #else | 69 #else |
73 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 | 70 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 |
74 #endif | 71 #endif |
OLD | NEW |