Changeset 141468 in webkit


Ignore:
Timestamp:
Jan 31, 2013 12:52:29 PM (11 years ago)
Author:
ddkilzer@apple.com
Message:

Use OS() and PLATFORM() macros in WebCorePrefix.h for readability
<​http://webkit.org/b/108374>

Reviewed by Laszlo Gombos.

  • WebCorePrefix.h: Replaced all possible checks with OS() or

PLATFORM() macros other than APPLE.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r141466 r141468  
     12013-01-31  David Kilzer  <ddkilzer@apple.com>
     2
     3        Use OS() and PLATFORM() macros in WebCorePrefix.h for readability
     4        <http://webkit.org/b/108374>
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * WebCorePrefix.h: Replaced all possible checks with OS() or
     9        PLATFORM() macros other than __APPLE__.
     10
    1112013-01-31  Mike West  <mkwst@chromium.org>
    212

  • trunk/Source/WebCore/WebCorePrefix.h

    r141254 r141468  
    3838#endif
    3939
    40 #if defined(WIN32) || defined(_WIN32)
     40#if OS(WINDOWS)
    4141
    4242#ifndef _WIN32_WINNT
    … …  
    4848#endif
    4949
    50 #ifndef WTF_USE_CURL
     50#if !USE(CURL)
    5151#ifndef _WINSOCKAPI_
    5252#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
    … …  
    6565#include <pthread.h>
    6666
    67 #endif // defined(WIN32) || defined(_WIN32)
     67#endif // OS(WINDOWS)
    6868
    6969#include <sys/types.h>
    … …  
    7575// On Linux this causes conflicts with libpng because there are two impls. of
    7676// longjmp - see here: https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409
    77 #ifndef BUILDING_WX__
     77#if !PLATFORM(WX)
    7878#include <setjmp.h>
    7979#endif
    … …  
    133133#endif
    134134
    135 #if !defined(BUILDING_WX__)
     135#if !PLATFORM(WX)
    136136#include <CoreFoundation/CoreFoundation.h>
    137 #ifdef WTF_PLATFORM_WIN_CAIRO
     137#if PLATFORM(WIN_CAIRO)
    138138#include <ConditionalMacros.h>
    139139#include <windows.h>
    140140#else
    141141
    142 #if defined(WIN32) || defined(_WIN32)
     142#if OS(WINDOWS)
    143143// FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, CoreServices header in CoreGraphics
    144144// We can remove this once the new ColorSync APIs are available in an internal Safari SDK.
    … …  
    156156#include <CoreServices/CoreServices.h>
    157157#endif // !PLATFORM(IOS)
    158 #endif // defined(WIN32) || defined(_WIN32)
     158#endif // OS(WINDOWS)
    159159
    160160#endif
    161 #endif // !defined(BUILDING_WX__)
     161#endif // !PLATFORM(WX)
    162162
    163163#ifdef __OBJC__
Note: See TracChangeset for help on using the changeset viewer.