diff -r 4f2f89ce4247 -r 303757a437d3 WebKitTools/DumpRenderTree/config.h --- a/WebKitTools/DumpRenderTree/config.h Fri Sep 17 09:02:29 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2008 Nuanti Ltd. - * - * 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. - * - */ - -#define Config_H - -#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H -#include "autotoolsconfig.h" -#endif - -#include - -#ifdef __cplusplus -#undef new -#undef delete -#include -#endif - -#if OS(WINDOWS) && !COMPILER(GCC) -#define JS_EXPORTDATA __declspec(dllimport) -#define WEBKIT_EXPORTDATA __declspec(dllimport) -#else -#define JS_EXPORTDATA -#define WEBKIT_EXPORTDATA -#endif - -#if PLATFORM(WIN) -#define WTF_PLATFORM_CF 1 -#if defined(WIN_CAIRO) -#define WTF_PLATFORM_CAIRO 1 -#define WTF_USE_CURL 1 -#else -#define WTF_PLATFORM_CG 1 -#define WTF_USE_CFNETWORK 1 -#endif - -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 - -#undef WINVER -#define WINVER 0x0500 - -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max -#undef max -#define max max -#undef min -#define min min - -#undef _WINSOCKAPI_ -#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h -#endif // PLATFORM(WIN)