Use STLPort instead of our stripped version.

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.

1 files changed, 62 insertions, 0 deletions

diff --git a/WebKit/android/stlport/stdio.h b/WebKit/android/stlport/stdio.h
new file mode 100644
index 0000000..271f37b
--- /dev/null
+++ b/WebKit/android/stlport/stdio.h
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ *
+ */
+
+/* Workaround for a "misbehaviour" when compiling resource scripts using
+ * eMbedded Visual C++. The standard .rc file includes windows header files,
+ * which in turn include stdarg.h, which results in warnings and errors
+ */
+#if !defined(RC_INVOKED)
+
+#  ifndef _STLP_OUTERMOST_HEADER_ID
+#    define _STLP_OUTERMOST_HEADER_ID 0x264
+#    include <stl/_prolog.h>
+#  elif (_STLP_OUTERMOST_HEADER_ID == 0x264) && !defined (_STLP_DONT_POP_HEADER_ID)
+#    define _STLP_DONT_POP_HEADER_ID
+#  endif
+
+#    if defined(_STLP_WCE_EVC3)
+struct _exception;
+#    endif
+#    include _STLP_NATIVE_C_HEADER(stdio.h)
+
+#    if defined (__SUNPRO_CC) && !defined (_STRUCT_FILE)
+#      define _STRUCT_FILE
+#    endif
+
+#    if (defined (__MWERKS__) && !defined (N_PLAT_NLM))  || defined (__BORLANDC__)
+#      undef stdin
+#      undef stdout
+#      undef stderr
+#      if defined (__MWERKS__)
+#      define stdin   (&_STLP_VENDOR_CSTD::__files[0])
+#      define stdout  (&_STLP_VENDOR_CSTD::__files[1])
+#      define stderr  (&_STLP_VENDOR_CSTD::__files[2])
+#      elif defined (__BORLANDC__)
+#        define stdin   (&_STLP_VENDOR_CSTD::_streams[0])
+#        define stdout  (&_STLP_VENDOR_CSTD::_streams[1])
+#        define stderr  (&_STLP_VENDOR_CSTD::_streams[2])
+#      endif
+#    endif
+
+#  if (_STLP_OUTERMOST_HEADER_ID == 0x264)
+#    if !defined (_STLP_DONT_POP_HEADER_ID)
+#      include <stl/_epilog.h>
+#      undef  _STLP_OUTERMOST_HEADER_ID
+#    else
+#      undef  _STLP_DONT_POP_HEADER_ID
+#    endif
+#  endif
+
+#endif /* RC_INVOKED */