| Index: Source/WebCore/config.h
|
| diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h
|
| deleted file mode 100644
|
| index e184237a1b7db294c7fe4e49249c1a6844c93510..0000000000000000000000000000000000000000
|
| --- a/Source/WebCore/config.h
|
| +++ /dev/null
|
| @@ -1,79 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.
|
| - * Copyright (C) 2009 Google Inc. All rights reserved.
|
| - *
|
| - * This library is free software; you can redistribute it and/or
|
| - * modify it under the terms of the GNU Library General Public
|
| - * License as published by the Free Software Foundation; either
|
| - * version 2 of the License, or (at your option) any later version.
|
| - *
|
| - * This library is distributed in the hope that it will be useful,
|
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
| - * Library General Public License for more details.
|
| - *
|
| - * You should have received a copy of the GNU Library General Public License
|
| - * along with this library; see the file COPYING.LIB. If not, write to
|
| - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
| - * Boston, MA 02110-1301, USA.
|
| - *
|
| - */
|
| -
|
| -#include <wtf/Platform.h>
|
| -
|
| -#include <wtf/ExportMacros.h>
|
| -
|
| -#ifdef __APPLE__
|
| -#define HAVE_FUNC_USLEEP 1
|
| -#endif /* __APPLE__ */
|
| -
|
| -#if OS(WINDOWS)
|
| -
|
| -#ifndef _WIN32_WINNT
|
| -#define _WIN32_WINNT 0x0502
|
| -#endif
|
| -
|
| -#ifndef WINVER
|
| -#define WINVER 0x0502
|
| -#endif
|
| -
|
| -// If we don't define these, they get defined in windef.h.
|
| -// We want to use std::min and std::max.
|
| -#ifndef max
|
| -#define max max
|
| -#endif
|
| -#ifndef min
|
| -#define min min
|
| -#endif
|
| -
|
| -// CURL needs winsock, so don't prevent inclusion of it
|
| -#if !USE(CURL)
|
| -#ifndef _WINSOCKAPI_
|
| -#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
|
| -#endif
|
| -#endif
|
| -
|
| -#endif /* OS(WINDOWS) */
|
| -
|
| -#ifdef __cplusplus
|
| -
|
| -// These undefs match up with defines in WebCorePrefix.h for Mac OS X.
|
| -// Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h".
|
| -#undef new
|
| -#undef delete
|
| -#include <wtf/FastMalloc.h>
|
| -
|
| -#include <ciso646>
|
| -
|
| -#endif
|
| -
|
| -#if COMPILER(MSVC)
|
| -#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
|
| -#else
|
| -#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
|
| -#endif
|
| -
|
| -// Chromium uses this file instead of JavaScriptCore/config.h to compile
|
| -// JavaScriptCore/wtf (chromium doesn't compile the rest of JSC). Therefore,
|
| -// this define is required.
|
| -#define WTF_CHANGES 1
|
|
|