WebCore:

[WebKit-https.git] / WebCore / WebCorePrefix.h

diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index a877611..04a0858 100644 (file)
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -1,8 +1,14 @@
-#include <config.h>
+#ifdef __cplusplus
+#define NULL __null
+#else
+#define NULL ((void *)0)
+#endif
 
 #include <assert.h>
 #include <ctype.h>
+#include <sys/types.h>
 #include <fcntl.h>
+#include <pthread.h>
 #include <regex.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -11,10 +17,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #ifdef __cplusplus
 
+#include <algorithm>
 #include <cstddef>
 #include <new>
 
@@ -22,6 +30,22 @@
 #include <ostream>
 #endif
 
+// Work around bug 3553309 by re-including <ctype.h>.
+#include <cctype>
+#define isalnum(c)      __istype((c), (_CTYPE_A|_CTYPE_D))
+#define isalpha(c)      __istype((c), _CTYPE_A)
+#define iscntrl(c)      __istype((c), _CTYPE_C)
+#define isdigit(c)      __isctype((c), _CTYPE_D)       /* ANSI -- locale independent */
+#define isgraph(c)      __istype((c), _CTYPE_G)
+#define islower(c)      __istype((c), _CTYPE_L)
+#define isprint(c)      __istype((c), _CTYPE_R)
+#define ispunct(c)      __istype((c), _CTYPE_P)
+#define isspace(c)      __istype((c), _CTYPE_S)
+#define isupper(c)      __istype((c), _CTYPE_U)
+#define isxdigit(c)     __isctype((c), _CTYPE_X)       /* ANSI -- locale independent */
+#define tolower(c)      __tolower(c)
+#define toupper(c)      __toupper(c)
+
 #endif
 
 #include <sys/types.h>
@@ -35,9 +59,19 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
 
-#ifdef __OBJC__
+#define KHTML_NO_XBL 1
 
-#import <Foundation/NSURLPathUtilities.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
+#define BUILDING_ON_PANTHER 1
+#endif
+
+#if BUILDING_ON_PANTHER
+#define OMIT_TIGER_FEATURES 1
+#endif
+
+#define KHTML_XSLT 1
+
+#ifdef __OBJC__
 
 #import <Cocoa/Cocoa.h>