diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Source/JavaScriptCore/JavaScriptCorePrefix.h | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCorePrefix.h')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCorePrefix.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCorePrefix.h b/Source/JavaScriptCore/JavaScriptCorePrefix.h new file mode 100644 index 0000000..21d6204 --- /dev/null +++ b/Source/JavaScriptCore/JavaScriptCorePrefix.h @@ -0,0 +1,36 @@ +#ifdef __cplusplus +#define NULL __null +#else +#define NULL ((void *)0) +#endif + +#include <ctype.h> +#include <float.h> +#include <locale.h> +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <time.h> +#include <sys/param.h> +#include <sys/time.h> +#include <sys/timeb.h> +#include <sys/types.h> + +#ifdef __cplusplus + +#include <list> +#include <typeinfo> + +#endif + +#ifdef __cplusplus +#define new ("if you use new/delete make sure to include config.h at the top of the file"()) +#define delete ("if you use new/delete make sure to include config.h at the top of the file"()) +#endif + +/* Work around bug with C++ library that screws up Objective-C++ when exception support is disabled. */ +#undef try +#undef catch + |