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

Side by Side Diff: Source/core/WebCorePrefix.h

Issue 13852045: Remove the remainings of the following guards: (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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/config.h ('k') | Tools/TestWebKitAPI/config.h » ('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, 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 29 matching lines...) Expand all
40 #if OS(WINDOWS) 40 #if OS(WINDOWS)
41 41
42 #ifndef _WIN32_WINNT 42 #ifndef _WIN32_WINNT
43 #define _WIN32_WINNT 0x0502 43 #define _WIN32_WINNT 0x0502
44 #endif 44 #endif
45 45
46 #ifndef WINVER 46 #ifndef WINVER
47 #define WINVER 0x0502 47 #define WINVER 0x0502
48 #endif 48 #endif
49 49
50 #if !USE(CURL)
51 #ifndef _WINSOCKAPI_ 50 #ifndef _WINSOCKAPI_
52 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h 51 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
53 #endif 52 #endif
54 #endif
55 53
56 // If we don't define these, they get defined in windef.h. 54 // If we don't define these, they get defined in windef.h.
57 // We want to use std::min and std::max 55 // We want to use std::min and std::max
58 #ifdef __cplusplus 56 #ifdef __cplusplus
59 #define max max 57 #define max max
60 #define min min 58 #define min min
61 #endif 59 #endif
62 60
63 #else 61 #else
64 62
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 151
154 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| 152 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
155 * to allow C++ code that expects exceptions to build. These definitions 153 * to allow C++ code that expects exceptions to build. These definitions
156 * interfere with Objective-C++ uses of Objective-C exception handlers, which 154 * interfere with Objective-C++ uses of Objective-C exception handlers, which
157 * use |@try| and |@catch|. As a workaround, undefine these macros. */ 155 * use |@try| and |@catch|. As a workaround, undefine these macros. */
158 #ifdef __OBJC__ 156 #ifdef __OBJC__
159 #undef try 157 #undef try
160 #undef catch 158 #undef catch
161 #endif 159 #endif
162 160
OLDNEW
« no previous file with comments | « Source/config.h ('k') | Tools/TestWebKitAPI/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698