diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /JavaScriptCore/kjs/config.h | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'JavaScriptCore/kjs/config.h')
| -rw-r--r-- | JavaScriptCore/kjs/config.h | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h index fd2779b..80a3798 100644 --- a/JavaScriptCore/kjs/config.h +++ b/JavaScriptCore/kjs/config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * 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 @@ -19,40 +19,19 @@ * */ -#include <wtf/Platform.h> - -#if PLATFORM(MAC) -#define HAVE_JNI 1 +#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H +#include "autotoolsconfig.h" #endif -#ifdef ANDROID +#include <wtf/Platform.h> -#define HAVE_JNI 1 -#define HAVE_FUNC_FINITE 1 -#define HAVE_MMAP 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_ERRNO_H 1 -#define HAVE_SBRK 1 +#if PLATFORM(ANDROID) #define ANDROID_MOBILE // change can be merged back to WebKit.org for MOBILE //#define ANDROID_INSTRUMENT +#endif -#define ANDROID_FIX // changes can be merged back, or already in, WebKit.org's ToT - -#elif PLATFORM(DARWIN) - -#define HAVE_ERRNO_H 1 -#define HAVE_MMAP 1 -#define HAVE_MERGESORT 1 -#define HAVE_SBRK 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TIMEB_H 1 - -#elif PLATFORM(WIN_OS) +#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 @@ -66,24 +45,9 @@ #endif #endif -#define HAVE_FLOAT_H 1 -#define HAVE_SYS_TIMEB_H 1 -#define HAVE_VIRTUALALLOC 1 - -#else - -/* FIXME: is this actually used or do other platforms generate their own config.h? */ - -#define HAVE_ERRNO_H 1 -#define HAVE_MMAP 1 -#define HAVE_SBRK 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 - #endif -#if PLATFORM(FREEBSD) +#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) #define HAVE_PTHREAD_NP_H 1 #endif |