| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #import <Cocoa/Cocoa.h> | 46 #import <Cocoa/Cocoa.h> |
| 47 #endif | 47 #endif |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 #elif defined(WIN32) || defined(_WIN32) | 50 #elif defined(WIN32) || defined(_WIN32) |
| 51 | 51 |
| 52 #ifndef NOMINMAX | 52 #ifndef NOMINMAX |
| 53 #define NOMINMAX | 53 #define NOMINMAX |
| 54 #endif | 54 #endif |
| 55 | 55 |
| 56 #if PLATFORM(WIN_CAIRO) | |
| 57 #undef WTF_USE_CG | |
| 58 #define WTF_USE_CAIRO 1 | |
| 59 #define WTF_USE_CURL 1 | |
| 60 #ifndef _WINSOCKAPI_ | |
| 61 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h | |
| 62 #endif | |
| 63 #elif !OS(WINCE) | |
| 64 #define WTF_USE_CG 1 | |
| 65 #undef WTF_USE_CAIRO | |
| 66 #undef WTF_USE_CURL | |
| 67 #endif | |
| 68 | |
| 69 #endif | 56 #endif |
| 70 | 57 |
| 71 #include <stdint.h> | 58 #include <stdint.h> |
| 72 | 59 |
| 73 #if !PLATFORM(IOS) && ((!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK)
&& defined(BUILDING_WEBKIT2__))) | 60 #if !PLATFORM(IOS) && ((!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK)
&& defined(BUILDING_WEBKIT2__))) |
| 74 #include <WebKit2/WebKit2_C.h> | 61 #include <WebKit2/WebKit2_C.h> |
| 75 #endif | 62 #endif |
| 76 | 63 |
| 77 #ifdef __clang__ | 64 #ifdef __clang__ |
| 78 // Work around the less strict coding standards of the gtest framework. | 65 // Work around the less strict coding standards of the gtest framework. |
| 79 #pragma clang diagnostic push | 66 #pragma clang diagnostic push |
| 80 #pragma clang diagnostic ignored "-Wunused-variable" | 67 #pragma clang diagnostic ignored "-Wunused-variable" |
| 81 #endif | 68 #endif |
| 82 | 69 |
| 83 #ifdef __cplusplus | 70 #ifdef __cplusplus |
| 84 #include <gtest/gtest.h> | 71 #include <gtest/gtest.h> |
| 85 #endif | 72 #endif |
| 86 | 73 |
| 87 #ifdef __clang__ | 74 #ifdef __clang__ |
| 88 // Finish working around the less strict coding standards of the gtest framework
. | 75 // Finish working around the less strict coding standards of the gtest framework
. |
| 89 #pragma clang diagnostic pop | 76 #pragma clang diagnostic pop |
| 90 #endif | 77 #endif |
| 91 | 78 |
| 92 #if PLATFORM(MAC) && defined(__OBJC__) | 79 #if PLATFORM(MAC) && defined(__OBJC__) |
| 93 #import <WebKit/WebKit.h> | 80 #import <WebKit/WebKit.h> |
| 94 #endif | 81 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 13852045:
Remove the remainings of the following guards: (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master