Changeset 23281 in webkit
- Timestamp:
- Apr 13, 2007 5:47:06 PM (17 years ago)
- Location:
- branches/WindowsMerge/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/WindowsMerge/WebCore/ChangeLog
r23276 r23281 1 2007-04-13 Adam Roben <aroben@apple.com> 2 3 Reviewed by Tim. 4 5 Sync our config.h with the OpenSource version so we can merge ours in 6 later. 7 8 * config.h: Added #defines from the OpenSource version, moved 9 Windows-specific defines inside #if PLATFORM(WIN[_OS]), and got rid 10 of assert.h 11 * platform/win/CursorWin.cpp: 12 (WebCore::Cursor::Cursor): Use ASSERT instead of assert. 13 1 14 2007-04-13 Adam Roben <aroben@apple.com> 2 15 -
branches/WindowsMerge/WebCore/config.h
r23090 r23281 21 21 #include <wtf/Platform.h> 22 22 23 #define MOBILE 0 24 23 25 #if __APPLE__ 24 26 #define HAVE_FUNC_USLEEP 1 25 27 #endif /* __APPLE__ */ 26 28 27 // If we don't define these, they get defined in windef.h.28 // We want to use std::min and std::max29 #define max max30 #define min min31 29 32 30 #if PLATFORM(WIN_OS) … … 40 38 #endif 41 39 42 // FIXME: Should probably just dump this eventually, but it's needed for now. 43 // We get this from some system place on OS X; probably better not to use it 44 // in WebCore code. 45 #include <assert.h> 40 // If we don't define these, they get defined in windef.h. 41 // We want to use std::min and std::max 42 #define max max 43 #define min min 44 45 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h 46 46 47 47 #endif /* PLATFORM(WIN_OS) */ 48 48 49 #if !PLATFORM(SYMBIAN) 50 #define IMPORT_C 51 #define EXPORT_C 52 #endif 49 53 50 54 #ifdef __cplusplus … … 62 66 #endif 63 67 64 // Special tweaks for the internal tree65 #define WTF_PLATFORM_CF 166 67 68 #if PLATFORM(WIN) 68 69 #define WTF_USE_JAVASCRIPTCORE_BINDINGS 1 … … 72 73 #define WTF_USE_CFNETWORK 1 73 74 #undef WTF_USE_WININET 75 #define WTF_PLATFORM_CF 1 76 #endif 77 78 #if PLATFORM(MAC) 79 #define WTF_USE_JAVASCRIPTCORE_BINDINGS 1 80 #define WTF_USE_NPOBJECT 1 81 #endif 82 83 #if PLATFORM(SYMBIAN) 84 #define WTF_USE_JAVASCRIPTCORE_BINDINGS 1 85 #define WTF_USE_NPOBJECT 1 86 #undef WIN32 87 #undef _WIN32 88 #undef AVOID_STATIC_CONSTRUCTORS 89 #define USE_SYSTEM_MALLOC 1 90 #define U_HAVE_INT8_T 0 91 #define U_HAVE_INT16_T 0 92 #define U_HAVE_INT32_T 0 93 #define U_HAVE_INT64_T 0 94 #define U_HAVE_INTTYPES_H 0 95 96 #include <stdio.h> 97 #include <snprintf.h> 98 #include <limits.h> 99 #include <wtf/MathExtras.h> 74 100 #endif 75 101 … … 84 110 #endif 85 111 #endif /* PLATFORM(CG) */ 86 87 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h -
branches/WindowsMerge/WebCore/platform/win/CursorWin.cpp
r22990 r23281 64 64 if (doAlpha) { 65 65 hCursor = CreateDIBSection(dc, (BITMAPINFO *)&cursorImage, DIB_RGB_COLORS, 0, 0, 0); 66 assert(hCursor);66 ASSERT(hCursor); 67 67 68 68 img->getHBITMAP(hCursor); … … 91 91 HDC xorMaskDC = CreateCompatibleDC(dc); 92 92 hCursor = CreateDIBSection(dc, &cursorImage, DIB_RGB_COLORS, 0, 0, 0); 93 assert(hCursor);93 ASSERT(hCursor); 94 94 img->getHBITMAP(hCursor); 95 95 BITMAP cursor;
Note: See TracChangeset
for help on using the changeset viewer.