This is the mail archive of the
ecos-discuss@sources.redhat.com
mailing list for the eCos project.
STLport with exception handling
- From: Oyvind Harboe <oyvind dot harboe at zylin dot com>
- To: ecos-discuss at sources dot redhat dot com
- Date: Wed, 28 Jan 2004 15:30:08 +0100
- Subject: [ECOS] STLport with exception handling
Ouch. Ignore the last patch I sent, here is the correct one.
Øyvind
diff -rua STLport-5.0-0125/stlport/config/stl_gcc.h /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/config/stl_gcc.h
--- STLport-5.0-0125/stlport/config/stl_gcc.h 2003-11-13 21:34:19.000000000 +0100
+++ /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/config/stl_gcc.h 2004-01-28 13:21:00.875321600 +0100
@@ -292,6 +292,7 @@
# define _STLP_REDEFINE_STD 1
# endif
+#ifndef _STLP_NATIVE_INCLUDE_PATH
# if ((__GNUC_MINOR__ == 0) || (__APPLE__))
# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
# else
@@ -301,6 +302,7 @@
# define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
# endif
# endif
+#endif
# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH/backward
# elif (__GNUC_MINOR__ < 8)
@@ -370,8 +372,12 @@
#endif /* GNUC_MINOR < 8 */
+#ifndef _STLP_NATIVE_CPP_C_INCLUDE_PATH
# define _STLP_NATIVE_CPP_C_INCLUDE_PATH _STLP_NATIVE_INCLUDE_PATH
+#endif
+#ifndef _STLP_NATIVE_C_INCLUDE_PATH
# define _STLP_NATIVE_C_INCLUDE_PATH ../include
+#endif
#ifdef _SCO_ELF
diff -rua STLport-5.0-0125/stlport/cstdio /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/cstdio
--- STLport-5.0-0125/stlport/cstdio 2003-11-15 15:15:33.000000000 +0100
+++ /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/cstdio 2004-01-28 12:17:05.029646400 +0100
@@ -96,16 +96,16 @@
using _STLP_VENDOR_CSTD::perror;
using _STLP_VENDOR_CSTD::printf;
using _STLP_VENDOR_CSTD::puts;
-using _STLP_VENDOR_CSTD::remove;
-using _STLP_VENDOR_CSTD::rename;
+//using _STLP_VENDOR_CSTD::remove;
+//using _STLP_VENDOR_CSTD::rename;
using _STLP_VENDOR_CSTD::rewind;
using _STLP_VENDOR_CSTD::scanf;
using _STLP_VENDOR_CSTD::setbuf;
using _STLP_VENDOR_CSTD::setvbuf;
using _STLP_VENDOR_CSTD::sprintf;
using _STLP_VENDOR_CSTD::sscanf;
-using _STLP_VENDOR_CSTD::tmpfile;
-using _STLP_VENDOR_CSTD::tmpnam;
+//using _STLP_VENDOR_CSTD::tmpfile;
+//using _STLP_VENDOR_CSTD::tmpnam;
using _STLP_VENDOR_CSTD::ungetc;
using _STLP_VENDOR_CSTD::vfprintf;
using _STLP_VENDOR_CSTD::vprintf;
diff -rua STLport-5.0-0125/stlport/stl/_site_config.h /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/stl/_site_config.h
--- STLport-5.0-0125/stlport/stl/_site_config.h 2003-12-20 23:13:11.000000000 +0100
+++ /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/stl/_site_config.h 2004-01-28 11:58:37.026416000 +0100
@@ -8,7 +8,7 @@
* multithreading support. Synonym is _NOTHREADS
*/
// #define _NOTHREADS
-// #define _STLP_NO_THREADS
+//#define _STLP_NO_THREADS
/* _PTHREADS: if defined, use Posix threads for multithreading support. */
// #define _PTHREADS
diff -rua STLport-5.0-0125/stlport/stl_user_config.h /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/stl_user_config.h
--- STLport-5.0-0125/stlport/stl_user_config.h 2004-01-25 16:15:54.000000000 +0100
+++ /cygdrive/c/e21/workspace/STLport-5.0-0125/stlport/stl_user_config.h 2004-01-28 15:12:38.993375200 +0100
@@ -375,7 +375,22 @@
//==========================================================
-
+// kludge. _Local_* isn't defined
+#define __CYGWIN__
+#define _STLP_USE_NEW_C_HEADERS
+#define _STLP_NO_OWN_NAMESPACE
+#define _STLP_NO_THREADS
+#define _NOTHREADS
+#define _STLP_NO_IOSTREAMS
+#define _STLP_NO_CUSTOM_IO
+#define _STLP_USE_MALLOC 1
+#define _STLP_NO_WCHAR_T 1
+
+
+#define _STLP_NATIVE_INCLUDE_PATH /cygdrive/c/e21/workspace/ecos-install/ecos/gnutools/arm-elf/arm-elf/include
+#undef _STLP_NATIVE_CPP_C_INCLUDE_PATH
+#define _STLP_NATIVE_CPP_C_INCLUDE_PATH /cygdrive/c/e21/workspace/ecos-install/ecos/gnutools/arm-elf/arm-elf/include
+// compatibility section
// Local Variables:
--
Before posting, please read the FAQ: http://sources.redhat.com/fom/ecos
and search the list archive: http://sources.redhat.com/ml/ecos-discuss