diff options
| author | Patrick Scott <phanna@android.com> | 2009-10-16 15:11:59 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-12-02 14:33:28 -0500 |
| commit | a47ab5294213cca2741f453b450b02666e08cac8 (patch) | |
| tree | 428576772386a65df40bbc18d1f7b41b06a01946 /WebKit/android/stlport/stl/config/_epilog.h | |
| parent | edac9050e2c3239d294f9039c54a31058ab0a783 (diff) | |
| download | external_webkit-a47ab5294213cca2741f453b450b02666e08cac8.zip external_webkit-a47ab5294213cca2741f453b450b02666e08cac8.tar.gz external_webkit-a47ab5294213cca2741f453b450b02666e08cac8.tar.bz2 | |
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.
Diffstat (limited to 'WebKit/android/stlport/stl/config/_epilog.h')
| -rw-r--r-- | WebKit/android/stlport/stl/config/_epilog.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/WebKit/android/stlport/stl/config/_epilog.h b/WebKit/android/stlport/stl/config/_epilog.h new file mode 100644 index 0000000..ecbace5 --- /dev/null +++ b/WebKit/android/stlport/stl/config/_epilog.h @@ -0,0 +1,32 @@ +#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__) + +#if defined (__BORLANDC__) +# pragma option pop +# pragma option -w-pow // -w-8062 Previous options and warnings not restored +#else +# if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200)) +# pragma warning (pop) +# endif +# pragma pack (pop) +#endif + +#elif defined (__sgi) && !defined (__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32) + +# pragma reset woff 1174 +# pragma reset woff 1375 +# pragma reset woff 1209 +/* from iterator_base.h */ +# pragma reset woff 1183 + +#elif defined (__DECCXX) + +# ifdef __PRAGMA_ENVIRONMENT +# pragma __environment __restore +# endif + +#elif defined (__IBMCPP__) + +# pragma info(restore) + +#endif + |