From f0073a99fda2bf1acd49fa66d0dd4272d09a1e61 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 3 Mar 2010 13:08:11 -0800 Subject: Use STLPort instead of our stripped version. DO NOT MERGE. This fixes the simulator build and allows us to get closer to sharing code with chromium. STLPort was copied with minor edits from the Android port of gears. --- WebKit/android/stlport/math.h | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 WebKit/android/stlport/math.h (limited to 'WebKit/android/stlport/math.h') diff --git a/WebKit/android/stlport/math.h b/WebKit/android/stlport/math.h new file mode 100644 index 0000000..57bf541 --- /dev/null +++ b/WebKit/android/stlport/math.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1999 + * Boris Fomitchev + * + * This material is provided "as is", with absolutely no warranty expressed + * or implied. Any use is at your own risk. + * + * Permission to use or copy this software for any purpose is hereby granted + * without fee, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. + * + */ + +#if !defined (_STLP_OUTERMOST_HEADER_ID) +# define _STLP_OUTERMOST_HEADER_ID 0x244 +# include +#elif (_STLP_OUTERMOST_HEADER_ID == 0x244) && !defined (_STLP_DONT_POP_HEADER_ID) +# define _STLP_DONT_POP_HEADER_ID +#endif + +#if !defined (exception) && (!defined (__KCC) || (__KCC_VERSION < 4000)) && \ + !(defined(__IBMCPP__) && (500 <= __IBMCPP__)) && !defined(_STLP_WCE_EVC3) +# define _STLP_EXCEPTION_WAS_REDEFINED 1 +# define exception __math_exception +#endif + +#include _STLP_NATIVE_C_HEADER(math.h) + +#if defined (_STLP_EXCEPTION_WAS_REDEFINED) +# undef exception +# undef _STLP_EXCEPTION_WAS_REDEFINED +#endif + +#ifdef _STLP_WCE_EVC3 +# undef _exception +# define _exception exception +#endif + +#if (_STLP_OUTERMOST_HEADER_ID == 0x244) +# if ! defined (_STLP_DONT_POP_HEADER_ID) +# include +# undef _STLP_OUTERMOST_HEADER_ID +# else +# undef _STLP_DONT_POP_HEADER_ID +# endif +#endif + +/* Local Variables: + * mode:C++ + * End: + */ -- cgit v1.1