diff -r 000000000000 -r 1918ee327afb src/3rdparty/webkit/JavaScriptCore/config.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/webkit/JavaScriptCore/config.h Mon Jan 11 14:00:40 2010 +0000 @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006 Samuel Weinig + * + * 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. + * + */ + +#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H +#include "autotoolsconfig.h" +#endif + +#include + +#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) +#define JS_EXPORTDATA __declspec(dllexport) +#else +#define JS_EXPORTDATA __declspec(dllimport) +#endif +#else +#define JS_EXPORTDATA +#endif + +#if PLATFORM(WIN_OS) + +// If we don't define these, they get defined in windef.h. +// We want to use std::min and std::max +#define max max +#define min min + +#if !COMPILER(MSVC7) && !PLATFORM(WINCE) +// We need to define this before the first #include of stdlib.h or it won't contain rand_s. +#ifndef _CRT_RAND_S +#define _CRT_RAND_S +#endif +#endif + +#endif + +#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) +#define HAVE_PTHREAD_NP_H 1 +#endif + +/* FIXME: if all platforms have these, do they really need #defines? */ +#define HAVE_STDINT_H 1 +#define HAVE_STRING_H 1 + +#define WTF_CHANGES 1 + +#ifdef __cplusplus +#undef new +#undef delete +#include +#endif + +// this breaks compilation of , at least, so turn it off for now +// Also generates errors on wx on Windows, because these functions +// are used from wx headers. +#if !PLATFORM(QT) && !PLATFORM(WX) +#include +#endif +