diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-16 07:51:00 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-16 07:58:16 (GMT) |
commit | 120329adb47dba60f532c1c2fd2ad0f37b812437 (patch) | |
tree | fc2311cef4b69fe7294e8f5aab27fe6af2546123 /src/3rdparty/javascriptcore/JavaScriptCore/config.h | |
parent | ce17ae5a6159d8ce3a5d2cc98f804a2debb860e5 (diff) | |
download | Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.zip Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.tar.gz Qt-120329adb47dba60f532c1c2fd2ad0f37b812437.tar.bz2 |
Separate the copy of JavaScriptCore that QtScript uses from the copy that
QtWebKit uses.
This is needed to decouple QtScript from QtWebKit, as discussed in the
WebKit team.
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/config.h')
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h new file mode 100644 index 0000000..6681761 --- /dev/null +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> + * + * 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 <wtf/Platform.h> + +#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 <wtf/FastMalloc.h> +#endif + +// this breaks compilation of <QFontDatabase>, 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 <wtf/DisallowCType.h> +#endif + |