diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake index cd0f0232d49..164d7a6fe84 100644 --- a/CMakeMacros.cmake +++ b/CMakeMacros.cmake @@ -121,15 +121,11 @@ MACRO(add_minicd FILENAME _dir _nameoncd) ENDMACRO(add_minicd) macro(set_cpp) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/stlport) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) set(IS_CPP 1) add_definitions( - -D_STLP_NATIVE_CPP_C_INCLUDE_PATH=../c++ - -D_STLP_NATIVE_C_INCLUDE_PATH=../crt - -D_STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH=../c++ - -D_STLP_USE_NEW_C_HEADERS - -D_STLP_NO_TYPEINFO - ) + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) endmacro() MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd diff --git a/include/c++/cerrno b/include/c++/cerrno new file mode 100644 index 00000000000..53d67d75e57 --- /dev/null +++ b/include/c++/cerrno @@ -0,0 +1,10 @@ +// C++ forwarding C errno header. + +#pragma once + +#include + +// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 +#ifndef errno +#define errno errno +#endif diff --git a/include/c++/cstdio b/include/c++/cstdio index 7cd54f19a72..f333ce652c8 100644 --- a/include/c++/cstdio +++ b/include/c++/cstdio @@ -94,4 +94,5 @@ namespace std using ::vfprintf; using ::vprintf; using ::vsprintf; + using ::vsnprintf; } diff --git a/include/c++/new b/include/c++/new index 8e2471f0d61..afa35b940f9 100644 --- a/include/c++/new +++ b/include/c++/new @@ -32,19 +32,17 @@ typedef void (*new_handler)(); new_handler set_new_handler(new_handler) throw(); -void* operator new (std::size_t size) throw (std::bad_alloc); void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); -void* operator new (std::size_t size, void* ptr) throw(); -void* operator new[] (std::size_t size) throw (std::bad_alloc); +inline void* operator new (std::size_t size, void* ptr) throw() { return ptr; } void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw(); -void* operator new[] (std::size_t size, void* ptr) throw(); +inline void* operator new[] (std::size_t size, void* ptr) throw() { return ptr; } void operator delete (void* ptr) throw (); void operator delete (void* ptr, const std::nothrow_t& nothrow_constant) throw(); -void operator delete (void* ptr, void* voidptr2) throw(); +inline void operator delete (void* ptr, void* voidptr2) throw() { } void operator delete[] (void* ptr) throw (); void operator delete[] (void* ptr, const std::nothrow_t& nothrow_constant) throw(); -void operator delete[] (void* ptr, void* voidptr2) throw(); +inline void operator delete[] (void* ptr, void* voidptr2) throw() { } //@} } // extern "C++" diff --git a/include/stlport/algorithm b/include/c++/stlport/algorithm similarity index 100% rename from include/stlport/algorithm rename to include/c++/stlport/algorithm diff --git a/include/stlport/assert.h b/include/c++/stlport/assert.h similarity index 100% rename from include/stlport/assert.h rename to include/c++/stlport/assert.h diff --git a/include/stlport/bitset b/include/c++/stlport/bitset similarity index 100% rename from include/stlport/bitset rename to include/c++/stlport/bitset diff --git a/include/stlport/cassert b/include/c++/stlport/cassert similarity index 100% rename from include/stlport/cassert rename to include/c++/stlport/cassert diff --git a/include/stlport/cctype b/include/c++/stlport/cctype similarity index 100% rename from include/stlport/cctype rename to include/c++/stlport/cctype diff --git a/include/stlport/cerrno b/include/c++/stlport/cerrno similarity index 100% rename from include/stlport/cerrno rename to include/c++/stlport/cerrno diff --git a/include/stlport/cfloat b/include/c++/stlport/cfloat similarity index 100% rename from include/stlport/cfloat rename to include/c++/stlport/cfloat diff --git a/include/stlport/ciso646 b/include/c++/stlport/ciso646 similarity index 100% rename from include/stlport/ciso646 rename to include/c++/stlport/ciso646 diff --git a/include/stlport/climits b/include/c++/stlport/climits similarity index 100% rename from include/stlport/climits rename to include/c++/stlport/climits diff --git a/include/stlport/clocale b/include/c++/stlport/clocale similarity index 100% rename from include/stlport/clocale rename to include/c++/stlport/clocale diff --git a/include/stlport/cmath b/include/c++/stlport/cmath similarity index 100% rename from include/stlport/cmath rename to include/c++/stlport/cmath diff --git a/include/stlport/complex b/include/c++/stlport/complex similarity index 100% rename from include/stlport/complex rename to include/c++/stlport/complex diff --git a/include/stlport/csetjmp b/include/c++/stlport/csetjmp similarity index 100% rename from include/stlport/csetjmp rename to include/c++/stlport/csetjmp diff --git a/include/stlport/csignal b/include/c++/stlport/csignal similarity index 100% rename from include/stlport/csignal rename to include/c++/stlport/csignal diff --git a/include/stlport/cstdarg b/include/c++/stlport/cstdarg similarity index 100% rename from include/stlport/cstdarg rename to include/c++/stlport/cstdarg diff --git a/include/stlport/cstddef b/include/c++/stlport/cstddef similarity index 100% rename from include/stlport/cstddef rename to include/c++/stlport/cstddef diff --git a/include/stlport/cstdio b/include/c++/stlport/cstdio similarity index 100% rename from include/stlport/cstdio rename to include/c++/stlport/cstdio diff --git a/include/stlport/cstdlib b/include/c++/stlport/cstdlib similarity index 100% rename from include/stlport/cstdlib rename to include/c++/stlport/cstdlib diff --git a/include/stlport/cstring b/include/c++/stlport/cstring similarity index 100% rename from include/stlport/cstring rename to include/c++/stlport/cstring diff --git a/include/stlport/ctime b/include/c++/stlport/ctime similarity index 100% rename from include/stlport/ctime rename to include/c++/stlport/ctime diff --git a/include/stlport/ctype.h b/include/c++/stlport/ctype.h similarity index 100% rename from include/stlport/ctype.h rename to include/c++/stlport/ctype.h diff --git a/include/stlport/cwchar b/include/c++/stlport/cwchar similarity index 100% rename from include/stlport/cwchar rename to include/c++/stlport/cwchar diff --git a/include/stlport/cwctype b/include/c++/stlport/cwctype similarity index 100% rename from include/stlport/cwctype rename to include/c++/stlport/cwctype diff --git a/include/stlport/deque b/include/c++/stlport/deque similarity index 100% rename from include/stlport/deque rename to include/c++/stlport/deque diff --git a/include/stlport/errno.h b/include/c++/stlport/errno.h similarity index 100% rename from include/stlport/errno.h rename to include/c++/stlport/errno.h diff --git a/include/stlport/exception b/include/c++/stlport/exception similarity index 100% rename from include/stlport/exception rename to include/c++/stlport/exception diff --git a/include/stlport/exception.h b/include/c++/stlport/exception.h similarity index 100% rename from include/stlport/exception.h rename to include/c++/stlport/exception.h diff --git a/include/stlport/float.h b/include/c++/stlport/float.h similarity index 100% rename from include/stlport/float.h rename to include/c++/stlport/float.h diff --git a/include/stlport/fstream b/include/c++/stlport/fstream similarity index 100% rename from include/stlport/fstream rename to include/c++/stlport/fstream diff --git a/include/stlport/fstream.h b/include/c++/stlport/fstream.h similarity index 100% rename from include/stlport/fstream.h rename to include/c++/stlport/fstream.h diff --git a/include/stlport/functional b/include/c++/stlport/functional similarity index 100% rename from include/stlport/functional rename to include/c++/stlport/functional diff --git a/include/stlport/hash_map b/include/c++/stlport/hash_map similarity index 100% rename from include/stlport/hash_map rename to include/c++/stlport/hash_map diff --git a/include/stlport/hash_set b/include/c++/stlport/hash_set similarity index 100% rename from include/stlport/hash_set rename to include/c++/stlport/hash_set diff --git a/include/stlport/iomanip b/include/c++/stlport/iomanip similarity index 100% rename from include/stlport/iomanip rename to include/c++/stlport/iomanip diff --git a/include/stlport/iomanip.h b/include/c++/stlport/iomanip.h similarity index 100% rename from include/stlport/iomanip.h rename to include/c++/stlport/iomanip.h diff --git a/include/stlport/ios b/include/c++/stlport/ios similarity index 100% rename from include/stlport/ios rename to include/c++/stlport/ios diff --git a/include/stlport/ios.h b/include/c++/stlport/ios.h similarity index 100% rename from include/stlport/ios.h rename to include/c++/stlport/ios.h diff --git a/include/stlport/iosfwd b/include/c++/stlport/iosfwd similarity index 100% rename from include/stlport/iosfwd rename to include/c++/stlport/iosfwd diff --git a/include/stlport/iostream b/include/c++/stlport/iostream similarity index 100% rename from include/stlport/iostream rename to include/c++/stlport/iostream diff --git a/include/stlport/iostream.h b/include/c++/stlport/iostream.h similarity index 100% rename from include/stlport/iostream.h rename to include/c++/stlport/iostream.h diff --git a/include/stlport/iso646.h b/include/c++/stlport/iso646.h similarity index 100% rename from include/stlport/iso646.h rename to include/c++/stlport/iso646.h diff --git a/include/stlport/istream b/include/c++/stlport/istream similarity index 100% rename from include/stlport/istream rename to include/c++/stlport/istream diff --git a/include/stlport/istream.h b/include/c++/stlport/istream.h similarity index 100% rename from include/stlport/istream.h rename to include/c++/stlport/istream.h diff --git a/include/stlport/iterator b/include/c++/stlport/iterator similarity index 100% rename from include/stlport/iterator rename to include/c++/stlport/iterator diff --git a/include/stlport/limits b/include/c++/stlport/limits similarity index 100% rename from include/stlport/limits rename to include/c++/stlport/limits diff --git a/include/stlport/limits.h b/include/c++/stlport/limits.h similarity index 100% rename from include/stlport/limits.h rename to include/c++/stlport/limits.h diff --git a/include/stlport/list b/include/c++/stlport/list similarity index 100% rename from include/stlport/list rename to include/c++/stlport/list diff --git a/include/stlport/locale b/include/c++/stlport/locale similarity index 100% rename from include/stlport/locale rename to include/c++/stlport/locale diff --git a/include/stlport/locale.h b/include/c++/stlport/locale.h similarity index 100% rename from include/stlport/locale.h rename to include/c++/stlport/locale.h diff --git a/include/stlport/map b/include/c++/stlport/map similarity index 100% rename from include/stlport/map rename to include/c++/stlport/map diff --git a/include/stlport/math.h b/include/c++/stlport/math.h similarity index 100% rename from include/stlport/math.h rename to include/c++/stlport/math.h diff --git a/include/stlport/mem.h b/include/c++/stlport/mem.h similarity index 100% rename from include/stlport/mem.h rename to include/c++/stlport/mem.h diff --git a/include/stlport/memory b/include/c++/stlport/memory similarity index 100% rename from include/stlport/memory rename to include/c++/stlport/memory diff --git a/include/stlport/new b/include/c++/stlport/new similarity index 100% rename from include/stlport/new rename to include/c++/stlport/new diff --git a/include/stlport/new.h b/include/c++/stlport/new.h similarity index 100% rename from include/stlport/new.h rename to include/c++/stlport/new.h diff --git a/include/stlport/numeric b/include/c++/stlport/numeric similarity index 100% rename from include/stlport/numeric rename to include/c++/stlport/numeric diff --git a/include/stlport/ostream b/include/c++/stlport/ostream similarity index 100% rename from include/stlport/ostream rename to include/c++/stlport/ostream diff --git a/include/stlport/ostream.h b/include/c++/stlport/ostream.h similarity index 100% rename from include/stlport/ostream.h rename to include/c++/stlport/ostream.h diff --git a/include/stlport/pthread.h b/include/c++/stlport/pthread.h similarity index 100% rename from include/stlport/pthread.h rename to include/c++/stlport/pthread.h diff --git a/include/stlport/pthread_alloc b/include/c++/stlport/pthread_alloc similarity index 100% rename from include/stlport/pthread_alloc rename to include/c++/stlport/pthread_alloc diff --git a/include/stlport/queue b/include/c++/stlport/queue similarity index 100% rename from include/stlport/queue rename to include/c++/stlport/queue diff --git a/include/stlport/rlocks.h b/include/c++/stlport/rlocks.h similarity index 100% rename from include/stlport/rlocks.h rename to include/c++/stlport/rlocks.h diff --git a/include/stlport/rope b/include/c++/stlport/rope similarity index 100% rename from include/stlport/rope rename to include/c++/stlport/rope diff --git a/include/stlport/set b/include/c++/stlport/set similarity index 100% rename from include/stlport/set rename to include/c++/stlport/set diff --git a/include/stlport/setjmp.h b/include/c++/stlport/setjmp.h similarity index 100% rename from include/stlport/setjmp.h rename to include/c++/stlport/setjmp.h diff --git a/include/stlport/signal.h b/include/c++/stlport/signal.h similarity index 100% rename from include/stlport/signal.h rename to include/c++/stlport/signal.h diff --git a/include/stlport/slist b/include/c++/stlport/slist similarity index 100% rename from include/stlport/slist rename to include/c++/stlport/slist diff --git a/include/stlport/sstream b/include/c++/stlport/sstream similarity index 100% rename from include/stlport/sstream rename to include/c++/stlport/sstream diff --git a/include/stlport/stack b/include/c++/stlport/stack similarity index 100% rename from include/stlport/stack rename to include/c++/stlport/stack diff --git a/include/stlport/stdarg.h b/include/c++/stlport/stdarg.h similarity index 100% rename from include/stlport/stdarg.h rename to include/c++/stlport/stdarg.h diff --git a/include/stlport/stddef.h b/include/c++/stlport/stddef.h similarity index 100% rename from include/stlport/stddef.h rename to include/c++/stlport/stddef.h diff --git a/include/stlport/stdexcept b/include/c++/stlport/stdexcept similarity index 100% rename from include/stlport/stdexcept rename to include/c++/stlport/stdexcept diff --git a/include/stlport/stdio.h b/include/c++/stlport/stdio.h similarity index 100% rename from include/stlport/stdio.h rename to include/c++/stlport/stdio.h diff --git a/include/stlport/stdiostream.h b/include/c++/stlport/stdiostream.h similarity index 100% rename from include/stlport/stdiostream.h rename to include/c++/stlport/stdiostream.h diff --git a/include/stlport/stdlib.h b/include/c++/stlport/stdlib.h similarity index 100% rename from include/stlport/stdlib.h rename to include/c++/stlport/stdlib.h diff --git a/include/stlport/stl/_abbrevs.h b/include/c++/stlport/stl/_abbrevs.h similarity index 100% rename from include/stlport/stl/_abbrevs.h rename to include/c++/stlport/stl/_abbrevs.h diff --git a/include/stlport/stl/_algo.c b/include/c++/stlport/stl/_algo.c similarity index 100% rename from include/stlport/stl/_algo.c rename to include/c++/stlport/stl/_algo.c diff --git a/include/stlport/stl/_algo.h b/include/c++/stlport/stl/_algo.h similarity index 100% rename from include/stlport/stl/_algo.h rename to include/c++/stlport/stl/_algo.h diff --git a/include/stlport/stl/_algobase.c b/include/c++/stlport/stl/_algobase.c similarity index 100% rename from include/stlport/stl/_algobase.c rename to include/c++/stlport/stl/_algobase.c diff --git a/include/stlport/stl/_algobase.h b/include/c++/stlport/stl/_algobase.h similarity index 100% rename from include/stlport/stl/_algobase.h rename to include/c++/stlport/stl/_algobase.h diff --git a/include/stlport/stl/_alloc.c b/include/c++/stlport/stl/_alloc.c similarity index 100% rename from include/stlport/stl/_alloc.c rename to include/c++/stlport/stl/_alloc.c diff --git a/include/stlport/stl/_alloc.h b/include/c++/stlport/stl/_alloc.h similarity index 100% rename from include/stlport/stl/_alloc.h rename to include/c++/stlport/stl/_alloc.h diff --git a/include/stlport/stl/_auto_ptr.h b/include/c++/stlport/stl/_auto_ptr.h similarity index 100% rename from include/stlport/stl/_auto_ptr.h rename to include/c++/stlport/stl/_auto_ptr.h diff --git a/include/stlport/stl/_bitset.c b/include/c++/stlport/stl/_bitset.c similarity index 100% rename from include/stlport/stl/_bitset.c rename to include/c++/stlport/stl/_bitset.c diff --git a/include/stlport/stl/_bitset.h b/include/c++/stlport/stl/_bitset.h similarity index 100% rename from include/stlport/stl/_bitset.h rename to include/c++/stlport/stl/_bitset.h diff --git a/include/stlport/stl/_bvector.h b/include/c++/stlport/stl/_bvector.h similarity index 100% rename from include/stlport/stl/_bvector.h rename to include/c++/stlport/stl/_bvector.h diff --git a/include/stlport/stl/_carray.h b/include/c++/stlport/stl/_carray.h similarity index 100% rename from include/stlport/stl/_carray.h rename to include/c++/stlport/stl/_carray.h diff --git a/include/stlport/stl/_cctype.h b/include/c++/stlport/stl/_cctype.h similarity index 100% rename from include/stlport/stl/_cctype.h rename to include/c++/stlport/stl/_cctype.h diff --git a/include/stlport/stl/_clocale.h b/include/c++/stlport/stl/_clocale.h similarity index 100% rename from include/stlport/stl/_clocale.h rename to include/c++/stlport/stl/_clocale.h diff --git a/include/stlport/stl/_cmath.h b/include/c++/stlport/stl/_cmath.h similarity index 100% rename from include/stlport/stl/_cmath.h rename to include/c++/stlport/stl/_cmath.h diff --git a/include/stlport/stl/_codecvt.h b/include/c++/stlport/stl/_codecvt.h similarity index 100% rename from include/stlport/stl/_codecvt.h rename to include/c++/stlport/stl/_codecvt.h diff --git a/include/stlport/stl/_collate.h b/include/c++/stlport/stl/_collate.h similarity index 100% rename from include/stlport/stl/_collate.h rename to include/c++/stlport/stl/_collate.h diff --git a/include/stlport/stl/_complex.c b/include/c++/stlport/stl/_complex.c similarity index 100% rename from include/stlport/stl/_complex.c rename to include/c++/stlport/stl/_complex.c diff --git a/include/stlport/stl/_complex.h b/include/c++/stlport/stl/_complex.h similarity index 100% rename from include/stlport/stl/_complex.h rename to include/c++/stlport/stl/_complex.h diff --git a/include/stlport/stl/_config_compat_post.h b/include/c++/stlport/stl/_config_compat_post.h similarity index 100% rename from include/stlport/stl/_config_compat_post.h rename to include/c++/stlport/stl/_config_compat_post.h diff --git a/include/stlport/stl/_construct.h b/include/c++/stlport/stl/_construct.h similarity index 100% rename from include/stlport/stl/_construct.h rename to include/c++/stlport/stl/_construct.h diff --git a/include/stlport/stl/_cprolog.h b/include/c++/stlport/stl/_cprolog.h similarity index 100% rename from include/stlport/stl/_cprolog.h rename to include/c++/stlport/stl/_cprolog.h diff --git a/include/stlport/stl/_csetjmp.h b/include/c++/stlport/stl/_csetjmp.h similarity index 100% rename from include/stlport/stl/_csetjmp.h rename to include/c++/stlport/stl/_csetjmp.h diff --git a/include/stlport/stl/_csignal.h b/include/c++/stlport/stl/_csignal.h similarity index 100% rename from include/stlport/stl/_csignal.h rename to include/c++/stlport/stl/_csignal.h diff --git a/include/stlport/stl/_cstdarg.h b/include/c++/stlport/stl/_cstdarg.h similarity index 100% rename from include/stlport/stl/_cstdarg.h rename to include/c++/stlport/stl/_cstdarg.h diff --git a/include/stlport/stl/_cstddef.h b/include/c++/stlport/stl/_cstddef.h similarity index 100% rename from include/stlport/stl/_cstddef.h rename to include/c++/stlport/stl/_cstddef.h diff --git a/include/stlport/stl/_cstdio.h b/include/c++/stlport/stl/_cstdio.h similarity index 100% rename from include/stlport/stl/_cstdio.h rename to include/c++/stlport/stl/_cstdio.h diff --git a/include/stlport/stl/_cstdlib.h b/include/c++/stlport/stl/_cstdlib.h similarity index 100% rename from include/stlport/stl/_cstdlib.h rename to include/c++/stlport/stl/_cstdlib.h diff --git a/include/stlport/stl/_cstring.h b/include/c++/stlport/stl/_cstring.h similarity index 100% rename from include/stlport/stl/_cstring.h rename to include/c++/stlport/stl/_cstring.h diff --git a/include/stlport/stl/_ctime.h b/include/c++/stlport/stl/_ctime.h similarity index 100% rename from include/stlport/stl/_ctime.h rename to include/c++/stlport/stl/_ctime.h diff --git a/include/stlport/stl/_ctraits_fns.h b/include/c++/stlport/stl/_ctraits_fns.h similarity index 100% rename from include/stlport/stl/_ctraits_fns.h rename to include/c++/stlport/stl/_ctraits_fns.h diff --git a/include/stlport/stl/_ctype.h b/include/c++/stlport/stl/_ctype.h similarity index 100% rename from include/stlport/stl/_ctype.h rename to include/c++/stlport/stl/_ctype.h diff --git a/include/stlport/stl/_cwchar.h b/include/c++/stlport/stl/_cwchar.h similarity index 100% rename from include/stlport/stl/_cwchar.h rename to include/c++/stlport/stl/_cwchar.h diff --git a/include/stlport/stl/_cwctype.h b/include/c++/stlport/stl/_cwctype.h similarity index 100% rename from include/stlport/stl/_cwctype.h rename to include/c++/stlport/stl/_cwctype.h diff --git a/include/stlport/stl/_deque.c b/include/c++/stlport/stl/_deque.c similarity index 100% rename from include/stlport/stl/_deque.c rename to include/c++/stlport/stl/_deque.c diff --git a/include/stlport/stl/_deque.h b/include/c++/stlport/stl/_deque.h similarity index 100% rename from include/stlport/stl/_deque.h rename to include/c++/stlport/stl/_deque.h diff --git a/include/stlport/stl/_epilog.h b/include/c++/stlport/stl/_epilog.h similarity index 100% rename from include/stlport/stl/_epilog.h rename to include/c++/stlport/stl/_epilog.h diff --git a/include/stlport/stl/_exception.h b/include/c++/stlport/stl/_exception.h similarity index 100% rename from include/stlport/stl/_exception.h rename to include/c++/stlport/stl/_exception.h diff --git a/include/stlport/stl/_facets_fwd.h b/include/c++/stlport/stl/_facets_fwd.h similarity index 100% rename from include/stlport/stl/_facets_fwd.h rename to include/c++/stlport/stl/_facets_fwd.h diff --git a/include/stlport/stl/_fstream.c b/include/c++/stlport/stl/_fstream.c similarity index 100% rename from include/stlport/stl/_fstream.c rename to include/c++/stlport/stl/_fstream.c diff --git a/include/stlport/stl/_fstream.h b/include/c++/stlport/stl/_fstream.h similarity index 100% rename from include/stlport/stl/_fstream.h rename to include/c++/stlport/stl/_fstream.h diff --git a/include/stlport/stl/_function.h b/include/c++/stlport/stl/_function.h similarity index 100% rename from include/stlport/stl/_function.h rename to include/c++/stlport/stl/_function.h diff --git a/include/stlport/stl/_function_adaptors.h b/include/c++/stlport/stl/_function_adaptors.h similarity index 100% rename from include/stlport/stl/_function_adaptors.h rename to include/c++/stlport/stl/_function_adaptors.h diff --git a/include/stlport/stl/_function_base.h b/include/c++/stlport/stl/_function_base.h similarity index 100% rename from include/stlport/stl/_function_base.h rename to include/c++/stlport/stl/_function_base.h diff --git a/include/stlport/stl/_hash_fun.h b/include/c++/stlport/stl/_hash_fun.h similarity index 100% rename from include/stlport/stl/_hash_fun.h rename to include/c++/stlport/stl/_hash_fun.h diff --git a/include/stlport/stl/_hash_map.h b/include/c++/stlport/stl/_hash_map.h similarity index 100% rename from include/stlport/stl/_hash_map.h rename to include/c++/stlport/stl/_hash_map.h diff --git a/include/stlport/stl/_hash_set.h b/include/c++/stlport/stl/_hash_set.h similarity index 100% rename from include/stlport/stl/_hash_set.h rename to include/c++/stlport/stl/_hash_set.h diff --git a/include/stlport/stl/_hashtable.c b/include/c++/stlport/stl/_hashtable.c similarity index 100% rename from include/stlport/stl/_hashtable.c rename to include/c++/stlport/stl/_hashtable.c diff --git a/include/stlport/stl/_hashtable.h b/include/c++/stlport/stl/_hashtable.h similarity index 100% rename from include/stlport/stl/_hashtable.h rename to include/c++/stlport/stl/_hashtable.h diff --git a/include/stlport/stl/_heap.c b/include/c++/stlport/stl/_heap.c similarity index 100% rename from include/stlport/stl/_heap.c rename to include/c++/stlport/stl/_heap.c diff --git a/include/stlport/stl/_heap.h b/include/c++/stlport/stl/_heap.h similarity index 100% rename from include/stlport/stl/_heap.h rename to include/c++/stlport/stl/_heap.h diff --git a/include/stlport/stl/_iomanip.h b/include/c++/stlport/stl/_iomanip.h similarity index 100% rename from include/stlport/stl/_iomanip.h rename to include/c++/stlport/stl/_iomanip.h diff --git a/include/stlport/stl/_ios.c b/include/c++/stlport/stl/_ios.c similarity index 100% rename from include/stlport/stl/_ios.c rename to include/c++/stlport/stl/_ios.c diff --git a/include/stlport/stl/_ios.h b/include/c++/stlport/stl/_ios.h similarity index 100% rename from include/stlport/stl/_ios.h rename to include/c++/stlport/stl/_ios.h diff --git a/include/stlport/stl/_ios_base.h b/include/c++/stlport/stl/_ios_base.h similarity index 100% rename from include/stlport/stl/_ios_base.h rename to include/c++/stlport/stl/_ios_base.h diff --git a/include/stlport/stl/_ioserr.h b/include/c++/stlport/stl/_ioserr.h similarity index 100% rename from include/stlport/stl/_ioserr.h rename to include/c++/stlport/stl/_ioserr.h diff --git a/include/stlport/stl/_iosfwd.h b/include/c++/stlport/stl/_iosfwd.h similarity index 100% rename from include/stlport/stl/_iosfwd.h rename to include/c++/stlport/stl/_iosfwd.h diff --git a/include/stlport/stl/_iostream_string.h b/include/c++/stlport/stl/_iostream_string.h similarity index 100% rename from include/stlport/stl/_iostream_string.h rename to include/c++/stlport/stl/_iostream_string.h diff --git a/include/stlport/stl/_istream.c b/include/c++/stlport/stl/_istream.c similarity index 100% rename from include/stlport/stl/_istream.c rename to include/c++/stlport/stl/_istream.c diff --git a/include/stlport/stl/_istream.h b/include/c++/stlport/stl/_istream.h similarity index 100% rename from include/stlport/stl/_istream.h rename to include/c++/stlport/stl/_istream.h diff --git a/include/stlport/stl/_istreambuf_iterator.h b/include/c++/stlport/stl/_istreambuf_iterator.h similarity index 100% rename from include/stlport/stl/_istreambuf_iterator.h rename to include/c++/stlport/stl/_istreambuf_iterator.h diff --git a/include/stlport/stl/_iterator.h b/include/c++/stlport/stl/_iterator.h similarity index 100% rename from include/stlport/stl/_iterator.h rename to include/c++/stlport/stl/_iterator.h diff --git a/include/stlport/stl/_iterator_base.h b/include/c++/stlport/stl/_iterator_base.h similarity index 100% rename from include/stlport/stl/_iterator_base.h rename to include/c++/stlport/stl/_iterator_base.h diff --git a/include/stlport/stl/_iterator_old.h b/include/c++/stlport/stl/_iterator_old.h similarity index 100% rename from include/stlport/stl/_iterator_old.h rename to include/c++/stlport/stl/_iterator_old.h diff --git a/include/stlport/stl/_limits.c b/include/c++/stlport/stl/_limits.c similarity index 100% rename from include/stlport/stl/_limits.c rename to include/c++/stlport/stl/_limits.c diff --git a/include/stlport/stl/_limits.h b/include/c++/stlport/stl/_limits.h similarity index 98% rename from include/stlport/stl/_limits.h rename to include/c++/stlport/stl/_limits.h index c0091f6aa9c..36f358803ef 100644 --- a/include/stlport/stl/_limits.h +++ b/include/c++/stlport/stl/_limits.h @@ -52,6 +52,13 @@ enum float_denorm_style { denorm_present = 1 }; +#ifdef min +# undef min +#endif +#ifdef max +# undef max +#endif + _STLP_MOVE_TO_PRIV_NAMESPACE // Base class for all specializations of numeric_limits. @@ -59,8 +66,8 @@ template class _Numeric_limits_base { public: - static __number (_STLP_CALL min)() _STLP_NOTHROW { return __number(); } - static __number (_STLP_CALL max)() _STLP_NOTHROW { return __number(); } + static __number _STLP_CALL min() _STLP_NOTHROW { return __number(); } + static __number _STLP_CALL max() _STLP_NOTHROW { return __number(); } _STLP_STATIC_CONSTANT(int, digits = 0); _STLP_STATIC_CONSTANT(int, digits10 = 0); @@ -118,8 +125,8 @@ template { public: - static _Int (_STLP_CALL min) () _STLP_NOTHROW { return (_Int)__imin; } - static _Int (_STLP_CALL max) () _STLP_NOTHROW { return (_Int)__imax; } + static _Int _STLP_CALL min () _STLP_NOTHROW { return (_Int)__imin; } + static _Int _STLP_CALL max () _STLP_NOTHROW { return (_Int)__imax; } _STLP_STATIC_CONSTANT(int, digits = (__idigits < 0) ? ((int)((sizeof(_Int) * (CHAR_BIT))) - ((__imin == 0) ? 0 : 1)) : (__idigits)); _STLP_STATIC_CONSTANT(int, digits10 = (digits * 301UL) / 1000); diff --git a/include/stlport/stl/_list.c b/include/c++/stlport/stl/_list.c similarity index 100% rename from include/stlport/stl/_list.c rename to include/c++/stlport/stl/_list.c diff --git a/include/stlport/stl/_list.h b/include/c++/stlport/stl/_list.h similarity index 100% rename from include/stlport/stl/_list.h rename to include/c++/stlport/stl/_list.h diff --git a/include/stlport/stl/_locale.h b/include/c++/stlport/stl/_locale.h similarity index 100% rename from include/stlport/stl/_locale.h rename to include/c++/stlport/stl/_locale.h diff --git a/include/stlport/stl/_map.h b/include/c++/stlport/stl/_map.h similarity index 100% rename from include/stlport/stl/_map.h rename to include/c++/stlport/stl/_map.h diff --git a/include/stlport/stl/_mbstate_t.h b/include/c++/stlport/stl/_mbstate_t.h similarity index 100% rename from include/stlport/stl/_mbstate_t.h rename to include/c++/stlport/stl/_mbstate_t.h diff --git a/include/stlport/stl/_messages_facets.h b/include/c++/stlport/stl/_messages_facets.h similarity index 100% rename from include/stlport/stl/_messages_facets.h rename to include/c++/stlport/stl/_messages_facets.h diff --git a/include/stlport/stl/_monetary.c b/include/c++/stlport/stl/_monetary.c similarity index 100% rename from include/stlport/stl/_monetary.c rename to include/c++/stlport/stl/_monetary.c diff --git a/include/stlport/stl/_monetary.h b/include/c++/stlport/stl/_monetary.h similarity index 100% rename from include/stlport/stl/_monetary.h rename to include/c++/stlport/stl/_monetary.h diff --git a/include/stlport/stl/_move_construct_fwk.h b/include/c++/stlport/stl/_move_construct_fwk.h similarity index 100% rename from include/stlport/stl/_move_construct_fwk.h rename to include/c++/stlport/stl/_move_construct_fwk.h diff --git a/include/stlport/stl/_new.h b/include/c++/stlport/stl/_new.h similarity index 100% rename from include/stlport/stl/_new.h rename to include/c++/stlport/stl/_new.h diff --git a/include/stlport/stl/_num_get.c b/include/c++/stlport/stl/_num_get.c similarity index 100% rename from include/stlport/stl/_num_get.c rename to include/c++/stlport/stl/_num_get.c diff --git a/include/stlport/stl/_num_get.h b/include/c++/stlport/stl/_num_get.h similarity index 100% rename from include/stlport/stl/_num_get.h rename to include/c++/stlport/stl/_num_get.h diff --git a/include/stlport/stl/_num_put.c b/include/c++/stlport/stl/_num_put.c similarity index 100% rename from include/stlport/stl/_num_put.c rename to include/c++/stlport/stl/_num_put.c diff --git a/include/stlport/stl/_num_put.h b/include/c++/stlport/stl/_num_put.h similarity index 100% rename from include/stlport/stl/_num_put.h rename to include/c++/stlport/stl/_num_put.h diff --git a/include/stlport/stl/_numeric.c b/include/c++/stlport/stl/_numeric.c similarity index 100% rename from include/stlport/stl/_numeric.c rename to include/c++/stlport/stl/_numeric.c diff --git a/include/stlport/stl/_numeric.h b/include/c++/stlport/stl/_numeric.h similarity index 100% rename from include/stlport/stl/_numeric.h rename to include/c++/stlport/stl/_numeric.h diff --git a/include/stlport/stl/_numpunct.h b/include/c++/stlport/stl/_numpunct.h similarity index 100% rename from include/stlport/stl/_numpunct.h rename to include/c++/stlport/stl/_numpunct.h diff --git a/include/stlport/stl/_ostream.c b/include/c++/stlport/stl/_ostream.c similarity index 100% rename from include/stlport/stl/_ostream.c rename to include/c++/stlport/stl/_ostream.c diff --git a/include/stlport/stl/_ostream.h b/include/c++/stlport/stl/_ostream.h similarity index 100% rename from include/stlport/stl/_ostream.h rename to include/c++/stlport/stl/_ostream.h diff --git a/include/stlport/stl/_ostreambuf_iterator.h b/include/c++/stlport/stl/_ostreambuf_iterator.h similarity index 100% rename from include/stlport/stl/_ostreambuf_iterator.h rename to include/c++/stlport/stl/_ostreambuf_iterator.h diff --git a/include/stlport/stl/_pair.h b/include/c++/stlport/stl/_pair.h similarity index 100% rename from include/stlport/stl/_pair.h rename to include/c++/stlport/stl/_pair.h diff --git a/include/stlport/stl/_prolog.h b/include/c++/stlport/stl/_prolog.h similarity index 100% rename from include/stlport/stl/_prolog.h rename to include/c++/stlport/stl/_prolog.h diff --git a/include/stlport/stl/_pthread_alloc.h b/include/c++/stlport/stl/_pthread_alloc.h similarity index 100% rename from include/stlport/stl/_pthread_alloc.h rename to include/c++/stlport/stl/_pthread_alloc.h diff --git a/include/stlport/stl/_ptrs_specialize.h b/include/c++/stlport/stl/_ptrs_specialize.h similarity index 100% rename from include/stlport/stl/_ptrs_specialize.h rename to include/c++/stlport/stl/_ptrs_specialize.h diff --git a/include/stlport/stl/_queue.h b/include/c++/stlport/stl/_queue.h similarity index 100% rename from include/stlport/stl/_queue.h rename to include/c++/stlport/stl/_queue.h diff --git a/include/stlport/stl/_range_errors.c b/include/c++/stlport/stl/_range_errors.c similarity index 100% rename from include/stlport/stl/_range_errors.c rename to include/c++/stlport/stl/_range_errors.c diff --git a/include/stlport/stl/_range_errors.h b/include/c++/stlport/stl/_range_errors.h similarity index 100% rename from include/stlport/stl/_range_errors.h rename to include/c++/stlport/stl/_range_errors.h diff --git a/include/stlport/stl/_raw_storage_iter.h b/include/c++/stlport/stl/_raw_storage_iter.h similarity index 100% rename from include/stlport/stl/_raw_storage_iter.h rename to include/c++/stlport/stl/_raw_storage_iter.h diff --git a/include/stlport/stl/_relops_cont.h b/include/c++/stlport/stl/_relops_cont.h similarity index 100% rename from include/stlport/stl/_relops_cont.h rename to include/c++/stlport/stl/_relops_cont.h diff --git a/include/stlport/stl/_relops_hash_cont.h b/include/c++/stlport/stl/_relops_hash_cont.h similarity index 100% rename from include/stlport/stl/_relops_hash_cont.h rename to include/c++/stlport/stl/_relops_hash_cont.h diff --git a/include/stlport/stl/_rope.c b/include/c++/stlport/stl/_rope.c similarity index 100% rename from include/stlport/stl/_rope.c rename to include/c++/stlport/stl/_rope.c diff --git a/include/stlport/stl/_rope.h b/include/c++/stlport/stl/_rope.h similarity index 100% rename from include/stlport/stl/_rope.h rename to include/c++/stlport/stl/_rope.h diff --git a/include/stlport/stl/_set.h b/include/c++/stlport/stl/_set.h similarity index 100% rename from include/stlport/stl/_set.h rename to include/c++/stlport/stl/_set.h diff --git a/include/stlport/stl/_slist.c b/include/c++/stlport/stl/_slist.c similarity index 100% rename from include/stlport/stl/_slist.c rename to include/c++/stlport/stl/_slist.c diff --git a/include/stlport/stl/_slist.h b/include/c++/stlport/stl/_slist.h similarity index 100% rename from include/stlport/stl/_slist.h rename to include/c++/stlport/stl/_slist.h diff --git a/include/stlport/stl/_slist_base.c b/include/c++/stlport/stl/_slist_base.c similarity index 100% rename from include/stlport/stl/_slist_base.c rename to include/c++/stlport/stl/_slist_base.c diff --git a/include/stlport/stl/_slist_base.h b/include/c++/stlport/stl/_slist_base.h similarity index 100% rename from include/stlport/stl/_slist_base.h rename to include/c++/stlport/stl/_slist_base.h diff --git a/include/stlport/stl/_sparc_atomic.h b/include/c++/stlport/stl/_sparc_atomic.h similarity index 100% rename from include/stlport/stl/_sparc_atomic.h rename to include/c++/stlport/stl/_sparc_atomic.h diff --git a/include/stlport/stl/_sstream.c b/include/c++/stlport/stl/_sstream.c similarity index 100% rename from include/stlport/stl/_sstream.c rename to include/c++/stlport/stl/_sstream.c diff --git a/include/stlport/stl/_sstream.h b/include/c++/stlport/stl/_sstream.h similarity index 100% rename from include/stlport/stl/_sstream.h rename to include/c++/stlport/stl/_sstream.h diff --git a/include/stlport/stl/_stack.h b/include/c++/stlport/stl/_stack.h similarity index 100% rename from include/stlport/stl/_stack.h rename to include/c++/stlport/stl/_stack.h diff --git a/include/stlport/stl/_stdexcept.h b/include/c++/stlport/stl/_stdexcept.h similarity index 100% rename from include/stlport/stl/_stdexcept.h rename to include/c++/stlport/stl/_stdexcept.h diff --git a/include/stlport/stl/_stdexcept_base.c b/include/c++/stlport/stl/_stdexcept_base.c similarity index 100% rename from include/stlport/stl/_stdexcept_base.c rename to include/c++/stlport/stl/_stdexcept_base.c diff --git a/include/stlport/stl/_stdexcept_base.h b/include/c++/stlport/stl/_stdexcept_base.h similarity index 100% rename from include/stlport/stl/_stdexcept_base.h rename to include/c++/stlport/stl/_stdexcept_base.h diff --git a/include/stlport/stl/_stlport_version.h b/include/c++/stlport/stl/_stlport_version.h similarity index 100% rename from include/stlport/stl/_stlport_version.h rename to include/c++/stlport/stl/_stlport_version.h diff --git a/include/stlport/stl/_stream_iterator.h b/include/c++/stlport/stl/_stream_iterator.h similarity index 100% rename from include/stlport/stl/_stream_iterator.h rename to include/c++/stlport/stl/_stream_iterator.h diff --git a/include/stlport/stl/_streambuf.c b/include/c++/stlport/stl/_streambuf.c similarity index 100% rename from include/stlport/stl/_streambuf.c rename to include/c++/stlport/stl/_streambuf.c diff --git a/include/stlport/stl/_streambuf.h b/include/c++/stlport/stl/_streambuf.h similarity index 100% rename from include/stlport/stl/_streambuf.h rename to include/c++/stlport/stl/_streambuf.h diff --git a/include/stlport/stl/_string.c b/include/c++/stlport/stl/_string.c similarity index 100% rename from include/stlport/stl/_string.c rename to include/c++/stlport/stl/_string.c diff --git a/include/stlport/stl/_string.h b/include/c++/stlport/stl/_string.h similarity index 100% rename from include/stlport/stl/_string.h rename to include/c++/stlport/stl/_string.h diff --git a/include/stlport/stl/_string_base.h b/include/c++/stlport/stl/_string_base.h similarity index 100% rename from include/stlport/stl/_string_base.h rename to include/c++/stlport/stl/_string_base.h diff --git a/include/stlport/stl/_string_fwd.h b/include/c++/stlport/stl/_string_fwd.h similarity index 100% rename from include/stlport/stl/_string_fwd.h rename to include/c++/stlport/stl/_string_fwd.h diff --git a/include/stlport/stl/_string_hash.h b/include/c++/stlport/stl/_string_hash.h similarity index 100% rename from include/stlport/stl/_string_hash.h rename to include/c++/stlport/stl/_string_hash.h diff --git a/include/stlport/stl/_string_io.c b/include/c++/stlport/stl/_string_io.c similarity index 100% rename from include/stlport/stl/_string_io.c rename to include/c++/stlport/stl/_string_io.c diff --git a/include/stlport/stl/_string_io.h b/include/c++/stlport/stl/_string_io.h similarity index 100% rename from include/stlport/stl/_string_io.h rename to include/c++/stlport/stl/_string_io.h diff --git a/include/stlport/stl/_string_npos.h b/include/c++/stlport/stl/_string_npos.h similarity index 100% rename from include/stlport/stl/_string_npos.h rename to include/c++/stlport/stl/_string_npos.h diff --git a/include/stlport/stl/_string_operators.h b/include/c++/stlport/stl/_string_operators.h similarity index 100% rename from include/stlport/stl/_string_operators.h rename to include/c++/stlport/stl/_string_operators.h diff --git a/include/stlport/stl/_string_sum.h b/include/c++/stlport/stl/_string_sum.h similarity index 100% rename from include/stlport/stl/_string_sum.h rename to include/c++/stlport/stl/_string_sum.h diff --git a/include/stlport/stl/_string_sum_methods.h b/include/c++/stlport/stl/_string_sum_methods.h similarity index 100% rename from include/stlport/stl/_string_sum_methods.h rename to include/c++/stlport/stl/_string_sum_methods.h diff --git a/include/stlport/stl/_string_workaround.h b/include/c++/stlport/stl/_string_workaround.h similarity index 100% rename from include/stlport/stl/_string_workaround.h rename to include/c++/stlport/stl/_string_workaround.h diff --git a/include/stlport/stl/_strstream.h b/include/c++/stlport/stl/_strstream.h similarity index 100% rename from include/stlport/stl/_strstream.h rename to include/c++/stlport/stl/_strstream.h diff --git a/include/stlport/stl/_tempbuf.c b/include/c++/stlport/stl/_tempbuf.c similarity index 100% rename from include/stlport/stl/_tempbuf.c rename to include/c++/stlport/stl/_tempbuf.c diff --git a/include/stlport/stl/_tempbuf.h b/include/c++/stlport/stl/_tempbuf.h similarity index 100% rename from include/stlport/stl/_tempbuf.h rename to include/c++/stlport/stl/_tempbuf.h diff --git a/include/stlport/stl/_threads.c b/include/c++/stlport/stl/_threads.c similarity index 100% rename from include/stlport/stl/_threads.c rename to include/c++/stlport/stl/_threads.c diff --git a/include/stlport/stl/_threads.h b/include/c++/stlport/stl/_threads.h similarity index 100% rename from include/stlport/stl/_threads.h rename to include/c++/stlport/stl/_threads.h diff --git a/include/stlport/stl/_time_facets.c b/include/c++/stlport/stl/_time_facets.c similarity index 100% rename from include/stlport/stl/_time_facets.c rename to include/c++/stlport/stl/_time_facets.c diff --git a/include/stlport/stl/_time_facets.h b/include/c++/stlport/stl/_time_facets.h similarity index 100% rename from include/stlport/stl/_time_facets.h rename to include/c++/stlport/stl/_time_facets.h diff --git a/include/stlport/stl/_tree.c b/include/c++/stlport/stl/_tree.c similarity index 100% rename from include/stlport/stl/_tree.c rename to include/c++/stlport/stl/_tree.c diff --git a/include/stlport/stl/_tree.h b/include/c++/stlport/stl/_tree.h similarity index 100% rename from include/stlport/stl/_tree.h rename to include/c++/stlport/stl/_tree.h diff --git a/include/stlport/stl/_typeinfo.h b/include/c++/stlport/stl/_typeinfo.h similarity index 100% rename from include/stlport/stl/_typeinfo.h rename to include/c++/stlport/stl/_typeinfo.h diff --git a/include/stlport/stl/_uninitialized.h b/include/c++/stlport/stl/_uninitialized.h similarity index 100% rename from include/stlport/stl/_uninitialized.h rename to include/c++/stlport/stl/_uninitialized.h diff --git a/include/stlport/stl/_unordered_map.h b/include/c++/stlport/stl/_unordered_map.h similarity index 100% rename from include/stlport/stl/_unordered_map.h rename to include/c++/stlport/stl/_unordered_map.h diff --git a/include/stlport/stl/_unordered_set.h b/include/c++/stlport/stl/_unordered_set.h similarity index 100% rename from include/stlport/stl/_unordered_set.h rename to include/c++/stlport/stl/_unordered_set.h diff --git a/include/stlport/stl/_valarray.c b/include/c++/stlport/stl/_valarray.c similarity index 100% rename from include/stlport/stl/_valarray.c rename to include/c++/stlport/stl/_valarray.c diff --git a/include/stlport/stl/_valarray.h b/include/c++/stlport/stl/_valarray.h similarity index 100% rename from include/stlport/stl/_valarray.h rename to include/c++/stlport/stl/_valarray.h diff --git a/include/stlport/stl/_vector.c b/include/c++/stlport/stl/_vector.c similarity index 100% rename from include/stlport/stl/_vector.c rename to include/c++/stlport/stl/_vector.c diff --git a/include/stlport/stl/_vector.h b/include/c++/stlport/stl/_vector.h similarity index 100% rename from include/stlport/stl/_vector.h rename to include/c++/stlport/stl/_vector.h diff --git a/include/stlport/stl/boost_type_traits.h b/include/c++/stlport/stl/boost_type_traits.h similarity index 100% rename from include/stlport/stl/boost_type_traits.h rename to include/c++/stlport/stl/boost_type_traits.h diff --git a/include/stlport/stl/c_locale.h b/include/c++/stlport/stl/c_locale.h similarity index 100% rename from include/stlport/stl/c_locale.h rename to include/c++/stlport/stl/c_locale.h diff --git a/include/stlport/stl/char_traits.h b/include/c++/stlport/stl/char_traits.h similarity index 100% rename from include/stlport/stl/char_traits.h rename to include/c++/stlport/stl/char_traits.h diff --git a/include/stlport/stl/concept_checks.h b/include/c++/stlport/stl/concept_checks.h similarity index 100% rename from include/stlport/stl/concept_checks.h rename to include/c++/stlport/stl/concept_checks.h diff --git a/include/stlport/stl/config/_aix.h b/include/c++/stlport/stl/config/_aix.h similarity index 100% rename from include/stlport/stl/config/_aix.h rename to include/c++/stlport/stl/config/_aix.h diff --git a/include/stlport/stl/config/_apcc.h b/include/c++/stlport/stl/config/_apcc.h similarity index 100% rename from include/stlport/stl/config/_apcc.h rename to include/c++/stlport/stl/config/_apcc.h diff --git a/include/stlport/stl/config/_apple.h b/include/c++/stlport/stl/config/_apple.h similarity index 100% rename from include/stlport/stl/config/_apple.h rename to include/c++/stlport/stl/config/_apple.h diff --git a/include/stlport/stl/config/_as400.h b/include/c++/stlport/stl/config/_as400.h similarity index 100% rename from include/stlport/stl/config/_as400.h rename to include/c++/stlport/stl/config/_as400.h diff --git a/include/stlport/stl/config/_auto_link.h b/include/c++/stlport/stl/config/_auto_link.h similarity index 100% rename from include/stlport/stl/config/_auto_link.h rename to include/c++/stlport/stl/config/_auto_link.h diff --git a/include/stlport/stl/config/_bc.h b/include/c++/stlport/stl/config/_bc.h similarity index 100% rename from include/stlport/stl/config/_bc.h rename to include/c++/stlport/stl/config/_bc.h diff --git a/include/stlport/stl/config/_como.h b/include/c++/stlport/stl/config/_como.h similarity index 100% rename from include/stlport/stl/config/_como.h rename to include/c++/stlport/stl/config/_como.h diff --git a/include/stlport/stl/config/_cray.h b/include/c++/stlport/stl/config/_cray.h similarity index 100% rename from include/stlport/stl/config/_cray.h rename to include/c++/stlport/stl/config/_cray.h diff --git a/include/stlport/stl/config/_cygwin.h b/include/c++/stlport/stl/config/_cygwin.h similarity index 100% rename from include/stlport/stl/config/_cygwin.h rename to include/c++/stlport/stl/config/_cygwin.h diff --git a/include/stlport/stl/config/_dec.h b/include/c++/stlport/stl/config/_dec.h similarity index 100% rename from include/stlport/stl/config/_dec.h rename to include/c++/stlport/stl/config/_dec.h diff --git a/include/stlport/stl/config/_dec_vms.h b/include/c++/stlport/stl/config/_dec_vms.h similarity index 100% rename from include/stlport/stl/config/_dec_vms.h rename to include/c++/stlport/stl/config/_dec_vms.h diff --git a/include/stlport/stl/config/_detect_dll_or_lib.h b/include/c++/stlport/stl/config/_detect_dll_or_lib.h similarity index 100% rename from include/stlport/stl/config/_detect_dll_or_lib.h rename to include/c++/stlport/stl/config/_detect_dll_or_lib.h diff --git a/include/stlport/stl/config/_dm.h b/include/c++/stlport/stl/config/_dm.h similarity index 100% rename from include/stlport/stl/config/_dm.h rename to include/c++/stlport/stl/config/_dm.h diff --git a/include/stlport/stl/config/_epilog.h b/include/c++/stlport/stl/config/_epilog.h similarity index 100% rename from include/stlport/stl/config/_epilog.h rename to include/c++/stlport/stl/config/_epilog.h diff --git a/include/stlport/stl/config/_evc.h b/include/c++/stlport/stl/config/_evc.h similarity index 100% rename from include/stlport/stl/config/_evc.h rename to include/c++/stlport/stl/config/_evc.h diff --git a/include/stlport/stl/config/_feedback.h b/include/c++/stlport/stl/config/_feedback.h similarity index 100% rename from include/stlport/stl/config/_feedback.h rename to include/c++/stlport/stl/config/_feedback.h diff --git a/include/stlport/stl/config/_freebsd.h b/include/c++/stlport/stl/config/_freebsd.h similarity index 100% rename from include/stlport/stl/config/_freebsd.h rename to include/c++/stlport/stl/config/_freebsd.h diff --git a/include/stlport/stl/config/_fujitsu.h b/include/c++/stlport/stl/config/_fujitsu.h similarity index 100% rename from include/stlport/stl/config/_fujitsu.h rename to include/c++/stlport/stl/config/_fujitsu.h diff --git a/include/stlport/stl/config/_gcc.h b/include/c++/stlport/stl/config/_gcc.h similarity index 100% rename from include/stlport/stl/config/_gcc.h rename to include/c++/stlport/stl/config/_gcc.h diff --git a/include/stlport/stl/config/_hpacc.h b/include/c++/stlport/stl/config/_hpacc.h similarity index 100% rename from include/stlport/stl/config/_hpacc.h rename to include/c++/stlport/stl/config/_hpacc.h diff --git a/include/stlport/stl/config/_hpux.h b/include/c++/stlport/stl/config/_hpux.h similarity index 100% rename from include/stlport/stl/config/_hpux.h rename to include/c++/stlport/stl/config/_hpux.h diff --git a/include/stlport/stl/config/_ibm.h b/include/c++/stlport/stl/config/_ibm.h similarity index 100% rename from include/stlport/stl/config/_ibm.h rename to include/c++/stlport/stl/config/_ibm.h diff --git a/include/stlport/stl/config/_icc.h b/include/c++/stlport/stl/config/_icc.h similarity index 100% rename from include/stlport/stl/config/_icc.h rename to include/c++/stlport/stl/config/_icc.h diff --git a/include/stlport/stl/config/_intel.h b/include/c++/stlport/stl/config/_intel.h similarity index 100% rename from include/stlport/stl/config/_intel.h rename to include/c++/stlport/stl/config/_intel.h diff --git a/include/stlport/stl/config/_kai.h b/include/c++/stlport/stl/config/_kai.h similarity index 100% rename from include/stlport/stl/config/_kai.h rename to include/c++/stlport/stl/config/_kai.h diff --git a/include/stlport/stl/config/_linux.h b/include/c++/stlport/stl/config/_linux.h similarity index 100% rename from include/stlport/stl/config/_linux.h rename to include/c++/stlport/stl/config/_linux.h diff --git a/include/stlport/stl/config/_mac.h b/include/c++/stlport/stl/config/_mac.h similarity index 100% rename from include/stlport/stl/config/_mac.h rename to include/c++/stlport/stl/config/_mac.h diff --git a/include/stlport/stl/config/_macosx.h b/include/c++/stlport/stl/config/_macosx.h similarity index 100% rename from include/stlport/stl/config/_macosx.h rename to include/c++/stlport/stl/config/_macosx.h diff --git a/include/stlport/stl/config/_mlc.h b/include/c++/stlport/stl/config/_mlc.h similarity index 100% rename from include/stlport/stl/config/_mlc.h rename to include/c++/stlport/stl/config/_mlc.h diff --git a/include/stlport/stl/config/_msvc.h b/include/c++/stlport/stl/config/_msvc.h similarity index 100% rename from include/stlport/stl/config/_msvc.h rename to include/c++/stlport/stl/config/_msvc.h diff --git a/include/stlport/stl/config/_mwerks.h b/include/c++/stlport/stl/config/_mwerks.h similarity index 100% rename from include/stlport/stl/config/_mwerks.h rename to include/c++/stlport/stl/config/_mwerks.h diff --git a/include/stlport/stl/config/_native_headers.h b/include/c++/stlport/stl/config/_native_headers.h similarity index 100% rename from include/stlport/stl/config/_native_headers.h rename to include/c++/stlport/stl/config/_native_headers.h diff --git a/include/stlport/stl/config/_openbsd.h b/include/c++/stlport/stl/config/_openbsd.h similarity index 100% rename from include/stlport/stl/config/_openbsd.h rename to include/c++/stlport/stl/config/_openbsd.h diff --git a/include/stlport/stl/config/_prolog.h b/include/c++/stlport/stl/config/_prolog.h similarity index 100% rename from include/stlport/stl/config/_prolog.h rename to include/c++/stlport/stl/config/_prolog.h diff --git a/include/c++/stlport/stl/config/_reactos.h b/include/c++/stlport/stl/config/_reactos.h new file mode 100644 index 00000000000..552dd73dfc8 --- /dev/null +++ b/include/c++/stlport/stl/config/_reactos.h @@ -0,0 +1,308 @@ +/* + * Copyright (c) 2010 + * Jérôme Gardou + * + * + * This material is provided "as is", with absolutely no warranty expressed + * or implied. Any use is at your own risk. + * + * This file is in public domain. + */ + +/* + * Purpose of this file : + * + * A list of COMPILER-SPECIFIC portion of STLport settings. + * This file is provided to help in manual configuration + * of STLport. This file is being included by stlcomp.h + * when STLport is unable to identify your compiler. + * Please remove the error diagnostic below before adjusting + * macros. + * + */ +#ifndef _STLP_REACTOS_H +#define _STLP_REACTOS_H + +#if !defined (_STLP_COMPILER) +# ifdef _MSC_VER +# define _STLP_COMPILER "Microsoft Visual Studio C++" +# define _STLP_MSVC _MSC_VER +# define _STLP_MSVC_LIB _MSC_VER +# elif defined __MINGW32__ +# define _STLP_COMPILER "gcc" +# else +# error "Unrecognized compiler for reactos!" +# endif +#endif + +// We are WIN32 +#define _STLP_WIN32 + +// We declspec +#define _STLP_IMPORT_DECLSPEC __declspec(dllimport) +#define _STLP_EXPORT_DECLSPEC __declspec(dllexport) + +//========================================================== + +// the values choosen here as defaults try to give +// maximum functionality on the most conservative settings + +// Mostly correct guess, change it for Alpha (and other environments +// that has 64-bit "long") +# define _STLP_UINT32_T unsigned __int32 + +// Disables wchar_t functionality +// # define _STLP_NO_WCHAR_T 1 + +// Define if wchar_t is not an intrinsic type, and is actually a typedef to unsigned short. +// # define _STLP_WCHAR_T_IS_USHORT 1 + +// Uncomment if long long is available +# define _STLP_LONG_LONG __int64 +// Uncomment if long double is not available +// # define _STLP_NO_LONG_DOUBLE 1 + +// Uncomment this if your compiler does not support "typename" keyword +// # define _STLP_NEED_TYPENAME 1 + +// Uncomment this if your compiler does not support "mutable" keyword +// # define _STLP_NEED_MUTABLE 1 + +// Uncomment this if your compiler does not support "explicit" keyword +// # define _STLP_NEED_EXPLICIT 1 + +// Uncomment if new-style-casts like const_cast<> are not available +// # define _STLP_NO_NEW_STYLE_CASTS 1 + +// Uncomment this if your compiler does not have "bool" type +// # define _STLP_NO_BOOL 1 + +// Uncomment this if your compiler does not have "bool" type, but has "bool" keyword reserved +// # define _STLP_DONT_USE_BOOL_TYPEDEF 1 + +// Uncomment this if your compiler does not have "bool" type, but defines "bool" in +// # define _STLP_YVALS_H 1 + +// Uncomment this if your compiler has limited or no default template arguments for classes +// # define _STLP_LIMITED_DEFAULT_TEMPLATES 1 + +// Uncomment this if your compiler support only complete (not dependent on other parameters) +// types as default parameters for class templates +// # define _STLP_DEFAULT_TYPE_PARAM 1 + +// Uncomment this if your compiler do not support default parameters in template class methods +// # define _STLP_DONT_SUP_DFLT_PARAM 1 + +// Uncomment this if your compiler has problem with not-type +// default template parameters +// # define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1 + +// Define if compiler has +// trouble with functions getting non-type-parameterized classes as parameters +// # define _STLP_NON_TYPE_TMPL_PARAM_BUG 1 + +// Uncomment this if your compiler does not support namespaces +// # define _STLP_HAS_NO_NAMESPACES 1 + +// Uncomment if "using" keyword does not work with template types +// # define _STLP_BROKEN_USING_DIRECTIVE 1 + +// Uncomment this if your compiler does not support exceptions +// # define _STLP_HAS_NO_EXCEPTIONS 1 + +// Uncomment this when you are able to detect that the user do not +// want to use the exceptions feature. +// # define _STLP_DONT_USE_EXCEPTIONS 1 + +// Uncomment this if your compiler does not support exception specifications +// # define _STLP_NO_EXCEPTION_SPEC + +// Define this if your compiler requires return statement after throw() +// # define _STLP_THROW_RETURN_BUG 1 + +// Define this if your compiler do not support return of void +// # define _STLP_DONT_RETURN_VOID 1 + +// Header that comes with the compiler +// does not define bad_alloc exception +// # define _STLP_NO_BAD_ALLOC 1 + +// Define this if your compiler do not throw bad_alloc from the new operator +// # define _STLP_NEW_DONT_THROW_BAD_ALLOC 1 + +// Define this if your compiler has no rtti support or if it has been disabled +// # define _STLP_NO_RTTI 1 + +// Define this if there is no native type_info definition +# define _STLP_NO_TYPEINFO 1 + +// Uncomment if member template methods are not available +// # define _STLP_NO_MEMBER_TEMPLATES 1 + +// Uncomment if member template classes are not available +// # define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1 + +// Uncomment if your compiler do not support the std::allocator rebind technique +// This is a special case of bad member template classes support, it is automatically +// defined if _STLP_NO_MEMBER_TEMPLATE_CLASSES is defined. +// # define _STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE 1 + +// Uncomment if no "template" keyword should be used with member template classes +// # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1 + +// Compiler does not accept friend declaration qualified with namespace name. +// # define _STLP_NO_QUALIFIED_FRIENDS 1 + +// Uncomment if partial specialization is not available +// # define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1 + +// Define if class being partially specialized require full name (template parameters) +// of itself for method declarations +// # define _STLP_PARTIAL_SPEC_NEEDS_TEMPLATE_ARGS + +// Compiler has problem with qualified specializations (cont int, volatile int...) +// # define _STLP_QUALIFIED_SPECIALIZATION_BUG + +// Compiler has problems specializing members of partially +// specialized class +// # define _STLP_MEMBER_SPECIALIZATION_BUG + +// Uncomment if partial order of template functions is not available +// # define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1 + +// Uncomment if specialization of methods is not allowed +// # define _STLP_NO_METHOD_SPECIALIZATION 1 + +// Uncomment if full specialization does not use partial spec. syntax : template <> struct .... +// # define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1 + +// Uncomment if compiler does not support explicit template arguments for functions +// # define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS + +// Uncomment this if your compiler can't inline while(), for() +// # define _STLP_LOOP_INLINE_PROBLEMS 1 + +// Define if the compiler fails to match a template function argument of base +// # define _STLP_BASE_MATCH_BUG 1 + +// Define if the compiler fails to match a template function argument of base +// (non-template) +//# define _STLP_NONTEMPL_BASE_MATCH_BUG 1 + +// Define if the compiler rejects outline method definition +// explicitly taking nested types/typedefs +// # define _STLP_NESTED_TYPE_PARAM_BUG 1 + +// Compiler requires typename keyword on outline method definition +// explicitly taking nested types/typedefs +// #define _STLP_TYPENAME_ON_RETURN_TYPE + +// Define if the baseclass typedefs not visible from outside +// # define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1 + +// if your compiler have serious problems with typedefs, try this one +// # define _STLP_BASE_TYPEDEF_BUG 1 + +// Uncomment if getting errors compiling mem_fun* adaptors +// # define _STLP_MEMBER_POINTER_PARAM_BUG 1 + +// Uncomment if the compiler can't handle a constant-initializer in the +// declaration of a static const data member of integer type. +// (See section 9.4.2, paragraph 4, of the C++ standard.) +// # define _STLP_STATIC_CONST_INIT_BUG + +// Uncomment to indicate that the compiler do not like static constant +// definition. +// Meaningfull only if _STLP_STATIC_CONST_INIT_BUG is not defined. +// # define _STLP_NO_STATIC_CONST_DEFINITION + +// Define if default constructor for builtin integer type fails to initialize it to 0 +// In expression like new(&char) char(): +//# define _STLP_DEF_CONST_PLCT_NEW_BUG 1 +// In default function parameter like _M_method(_Tp __x = _Tp()) +//# define _STLP_DEF_CONST_DEF_PARAM_BUG 1 + +// Defined if constructor +// required to explicitly call member's default constructors for const objects +// # define _STLP_CONST_CONSTRUCTOR_BUG 1 + +// Defined if the compiler has trouble calling POD-types constructors/destructors +// # define _STLP_TRIVIAL_CONSTRUCTOR_BUG 1 +// # define _STLP_TRIVIAL_DESTRUCTOR_BUG 1 + +// Define if having problems specializing maps/sets with +// key type being const +// # define _STLP_MULTI_CONST_TEMPLATE_ARG_BUG + +// Uncomment this to disable -> operators on all iterators +// # define _STLP_NO_ARROW_OPERATOR 1 + +// Uncomment this to disble at() member functions for containers +// # define _STLP_NO_AT_MEMBER_FUNCTION 1 + +// Define this if compiler lacks header +// # define _STLP_NO_EXCEPTION_HEADER 1 + +// Uncomment this if your C library has lrand48() function +// # define _STLP_RAND48 1 + +// Uncomment if native new-style C library headers lile , etc are not available. +// # define _STLP_HAS_NO_NEW_C_HEADERS 1 + +// uncomment if new-style headers is available +// # define _STLP_HAS_NEW_NEW_HEADER 1 + +// uncomment this if and other STD headers put their stuff in ::namespace, +// not std:: +// # define _STLP_VENDOR_GLOBAL_STD + +// uncomment this if and the like put stuff in ::namespace, +// not std:: +// # define _STLP_VENDOR_GLOBAL_CSTD + +// uncomment this if your compiler consider as ambiguous a function imported within +// the stlport namespace and called without scope (:: or std::) +// # define _STLP_NO_USING_FOR_GLOBAL_FUNCTIONS 1 + +// uncomment this if your compiler define all the C math functions C++ additional +// overloads in ::namespace and not only in std::. +// # define _STLP_HAS_GLOBAL_C_MATH_FUNCTIONS 1 + +#define MKSTRING_(a) #a +#define MKSTRING(a) MKSTRING_(a) +#define _STLP_NATIVE_C_HEADER(header) MKSTRING(NATIVE_C_INCLUDE/header) +#define _STLP_NATIVE_CPP_C_HEADER(header) MKSTRING(NATIVE_CPP_INCLUDE/header) +#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) MKSTRING(NATIVE_CPP_INCLUDE/header) + + +// This macro constructs header path from directory and name. +// You may change it if your compiler does not understand "/". + +// This macro constructs native include header path from include path and name. +// You may have do define it if experimenting problems with preprocessor +// # define _STLP_NATIVE_HEADER(header) _STLP_MAKE_HEADER(_STLP_NATIVE_INCLUDE_PATH,header) + +// Same for C headers +// #define _STLP_NATIVE_C_HEADER(header) + +//========================================================== + +// We have no llabs, lldiv, etc. +#define _STLP_NO_VENDOR_STDLIB_L + +// new_handler is in global namespace +# define _STLP_GLOBAL_NEW_HANDLER + +// terminate function is in global namespace +#define _STLP_VENDOR_TERMINATE_STD + +// We don't want stlport to use its own namespace +#define _STLP_NO_OWN_NAMESPACE + +// Calling convention +#define _STLP_CALL __cdecl + +// Include stlport windows specifics +#include "_windows.h" + +#endif diff --git a/include/stlport/stl/config/_sgi.h b/include/c++/stlport/stl/config/_sgi.h similarity index 100% rename from include/stlport/stl/config/_sgi.h rename to include/c++/stlport/stl/config/_sgi.h diff --git a/include/stlport/stl/config/_solaris.h b/include/c++/stlport/stl/config/_solaris.h similarity index 100% rename from include/stlport/stl/config/_solaris.h rename to include/c++/stlport/stl/config/_solaris.h diff --git a/include/stlport/stl/config/_sunprocc.h b/include/c++/stlport/stl/config/_sunprocc.h similarity index 100% rename from include/stlport/stl/config/_sunprocc.h rename to include/c++/stlport/stl/config/_sunprocc.h diff --git a/include/stlport/stl/config/_system.h b/include/c++/stlport/stl/config/_system.h similarity index 98% rename from include/stlport/stl/config/_system.h rename to include/c++/stlport/stl/config/_system.h index a2dbb938dd7..10018a703b3 100644 --- a/include/stlport/stl/config/_system.h +++ b/include/c++/stlport/stl/config/_system.h @@ -36,7 +36,9 @@ #ifndef __stl_config__system_h #define __stl_config__system_h -#if defined (__sun) +#if defined (__REACTOS__) +# include +#elif defined (__sun) # include # if defined (__GNUC__) # include diff --git a/include/stlport/stl/config/_warnings_off.h b/include/c++/stlport/stl/config/_warnings_off.h similarity index 100% rename from include/stlport/stl/config/_warnings_off.h rename to include/c++/stlport/stl/config/_warnings_off.h diff --git a/include/stlport/stl/config/_watcom.h b/include/c++/stlport/stl/config/_watcom.h similarity index 100% rename from include/stlport/stl/config/_watcom.h rename to include/c++/stlport/stl/config/_watcom.h diff --git a/include/stlport/stl/config/_windows.h b/include/c++/stlport/stl/config/_windows.h similarity index 100% rename from include/stlport/stl/config/_windows.h rename to include/c++/stlport/stl/config/_windows.h diff --git a/include/stlport/stl/config/compat.h b/include/c++/stlport/stl/config/compat.h similarity index 100% rename from include/stlport/stl/config/compat.h rename to include/c++/stlport/stl/config/compat.h diff --git a/include/stlport/stl/config/features.h b/include/c++/stlport/stl/config/features.h similarity index 100% rename from include/stlport/stl/config/features.h rename to include/c++/stlport/stl/config/features.h diff --git a/include/stlport/stl/config/host.h b/include/c++/stlport/stl/config/host.h similarity index 100% rename from include/stlport/stl/config/host.h rename to include/c++/stlport/stl/config/host.h diff --git a/include/stlport/stl/config/stl_confix.h b/include/c++/stlport/stl/config/stl_confix.h similarity index 100% rename from include/stlport/stl/config/stl_confix.h rename to include/c++/stlport/stl/config/stl_confix.h diff --git a/include/stlport/stl/config/stl_mycomp.h b/include/c++/stlport/stl/config/stl_mycomp.h similarity index 100% rename from include/stlport/stl/config/stl_mycomp.h rename to include/c++/stlport/stl/config/stl_mycomp.h diff --git a/include/stlport/stl/config/user_config.h b/include/c++/stlport/stl/config/user_config.h similarity index 100% rename from include/stlport/stl/config/user_config.h rename to include/c++/stlport/stl/config/user_config.h diff --git a/include/stlport/stl/debug/_debug.c b/include/c++/stlport/stl/debug/_debug.c similarity index 100% rename from include/stlport/stl/debug/_debug.c rename to include/c++/stlport/stl/debug/_debug.c diff --git a/include/stlport/stl/debug/_debug.h b/include/c++/stlport/stl/debug/_debug.h similarity index 100% rename from include/stlport/stl/debug/_debug.h rename to include/c++/stlport/stl/debug/_debug.h diff --git a/include/stlport/stl/debug/_deque.h b/include/c++/stlport/stl/debug/_deque.h similarity index 100% rename from include/stlport/stl/debug/_deque.h rename to include/c++/stlport/stl/debug/_deque.h diff --git a/include/stlport/stl/debug/_hashtable.h b/include/c++/stlport/stl/debug/_hashtable.h similarity index 100% rename from include/stlport/stl/debug/_hashtable.h rename to include/c++/stlport/stl/debug/_hashtable.h diff --git a/include/stlport/stl/debug/_iterator.h b/include/c++/stlport/stl/debug/_iterator.h similarity index 100% rename from include/stlport/stl/debug/_iterator.h rename to include/c++/stlport/stl/debug/_iterator.h diff --git a/include/stlport/stl/debug/_list.h b/include/c++/stlport/stl/debug/_list.h similarity index 100% rename from include/stlport/stl/debug/_list.h rename to include/c++/stlport/stl/debug/_list.h diff --git a/include/stlport/stl/debug/_slist.h b/include/c++/stlport/stl/debug/_slist.h similarity index 100% rename from include/stlport/stl/debug/_slist.h rename to include/c++/stlport/stl/debug/_slist.h diff --git a/include/stlport/stl/debug/_string.h b/include/c++/stlport/stl/debug/_string.h similarity index 100% rename from include/stlport/stl/debug/_string.h rename to include/c++/stlport/stl/debug/_string.h diff --git a/include/stlport/stl/debug/_string_sum_methods.h b/include/c++/stlport/stl/debug/_string_sum_methods.h similarity index 100% rename from include/stlport/stl/debug/_string_sum_methods.h rename to include/c++/stlport/stl/debug/_string_sum_methods.h diff --git a/include/stlport/stl/debug/_tree.h b/include/c++/stlport/stl/debug/_tree.h similarity index 100% rename from include/stlport/stl/debug/_tree.h rename to include/c++/stlport/stl/debug/_tree.h diff --git a/include/stlport/stl/debug/_vector.h b/include/c++/stlport/stl/debug/_vector.h similarity index 100% rename from include/stlport/stl/debug/_vector.h rename to include/c++/stlport/stl/debug/_vector.h diff --git a/include/stlport/stl/msl_string.h b/include/c++/stlport/stl/msl_string.h similarity index 100% rename from include/stlport/stl/msl_string.h rename to include/c++/stlport/stl/msl_string.h diff --git a/include/stlport/stl/pointers/_deque.h b/include/c++/stlport/stl/pointers/_deque.h similarity index 100% rename from include/stlport/stl/pointers/_deque.h rename to include/c++/stlport/stl/pointers/_deque.h diff --git a/include/stlport/stl/pointers/_list.h b/include/c++/stlport/stl/pointers/_list.h similarity index 100% rename from include/stlport/stl/pointers/_list.h rename to include/c++/stlport/stl/pointers/_list.h diff --git a/include/stlport/stl/pointers/_set.h b/include/c++/stlport/stl/pointers/_set.h similarity index 100% rename from include/stlport/stl/pointers/_set.h rename to include/c++/stlport/stl/pointers/_set.h diff --git a/include/stlport/stl/pointers/_slist.h b/include/c++/stlport/stl/pointers/_slist.h similarity index 100% rename from include/stlport/stl/pointers/_slist.h rename to include/c++/stlport/stl/pointers/_slist.h diff --git a/include/stlport/stl/pointers/_tools.h b/include/c++/stlport/stl/pointers/_tools.h similarity index 100% rename from include/stlport/stl/pointers/_tools.h rename to include/c++/stlport/stl/pointers/_tools.h diff --git a/include/stlport/stl/pointers/_vector.h b/include/c++/stlport/stl/pointers/_vector.h similarity index 100% rename from include/stlport/stl/pointers/_vector.h rename to include/c++/stlport/stl/pointers/_vector.h diff --git a/include/stlport/stl/type_manips.h b/include/c++/stlport/stl/type_manips.h similarity index 100% rename from include/stlport/stl/type_manips.h rename to include/c++/stlport/stl/type_manips.h diff --git a/include/stlport/stl/type_traits.h b/include/c++/stlport/stl/type_traits.h similarity index 100% rename from include/stlport/stl/type_traits.h rename to include/c++/stlport/stl/type_traits.h diff --git a/include/stlport/streambuf b/include/c++/stlport/streambuf similarity index 100% rename from include/stlport/streambuf rename to include/c++/stlport/streambuf diff --git a/include/stlport/streambuf.h b/include/c++/stlport/streambuf.h similarity index 100% rename from include/stlport/streambuf.h rename to include/c++/stlport/streambuf.h diff --git a/include/stlport/string b/include/c++/stlport/string similarity index 100% rename from include/stlport/string rename to include/c++/stlport/string diff --git a/include/stlport/string.h b/include/c++/stlport/string.h similarity index 100% rename from include/stlport/string.h rename to include/c++/stlport/string.h diff --git a/include/stlport/strstream b/include/c++/stlport/strstream similarity index 100% rename from include/stlport/strstream rename to include/c++/stlport/strstream diff --git a/include/stlport/strstream.h b/include/c++/stlport/strstream.h similarity index 100% rename from include/stlport/strstream.h rename to include/c++/stlport/strstream.h diff --git a/include/stlport/time.h b/include/c++/stlport/time.h similarity index 100% rename from include/stlport/time.h rename to include/c++/stlport/time.h diff --git a/include/stlport/type_traits b/include/c++/stlport/type_traits similarity index 100% rename from include/stlport/type_traits rename to include/c++/stlport/type_traits diff --git a/include/stlport/typeinfo b/include/c++/stlport/typeinfo similarity index 100% rename from include/stlport/typeinfo rename to include/c++/stlport/typeinfo diff --git a/include/stlport/typeinfo.h b/include/c++/stlport/typeinfo.h similarity index 100% rename from include/stlport/typeinfo.h rename to include/c++/stlport/typeinfo.h diff --git a/include/stlport/unordered_map b/include/c++/stlport/unordered_map similarity index 100% rename from include/stlport/unordered_map rename to include/c++/stlport/unordered_map diff --git a/include/stlport/unordered_set b/include/c++/stlport/unordered_set similarity index 100% rename from include/stlport/unordered_set rename to include/c++/stlport/unordered_set diff --git a/include/stlport/using/cstring b/include/c++/stlport/using/cstring similarity index 100% rename from include/stlport/using/cstring rename to include/c++/stlport/using/cstring diff --git a/include/stlport/using/export b/include/c++/stlport/using/export similarity index 100% rename from include/stlport/using/export rename to include/c++/stlport/using/export diff --git a/include/stlport/using/fstream b/include/c++/stlport/using/fstream similarity index 100% rename from include/stlport/using/fstream rename to include/c++/stlport/using/fstream diff --git a/include/stlport/using/h/fstream.h b/include/c++/stlport/using/h/fstream.h similarity index 100% rename from include/stlport/using/h/fstream.h rename to include/c++/stlport/using/h/fstream.h diff --git a/include/stlport/using/h/iomanip.h b/include/c++/stlport/using/h/iomanip.h similarity index 100% rename from include/stlport/using/h/iomanip.h rename to include/c++/stlport/using/h/iomanip.h diff --git a/include/stlport/using/h/iostream.h b/include/c++/stlport/using/h/iostream.h similarity index 100% rename from include/stlport/using/h/iostream.h rename to include/c++/stlport/using/h/iostream.h diff --git a/include/stlport/using/h/ostream.h b/include/c++/stlport/using/h/ostream.h similarity index 100% rename from include/stlport/using/h/ostream.h rename to include/c++/stlport/using/h/ostream.h diff --git a/include/stlport/using/h/streambuf.h b/include/c++/stlport/using/h/streambuf.h similarity index 100% rename from include/stlport/using/h/streambuf.h rename to include/c++/stlport/using/h/streambuf.h diff --git a/include/stlport/using/h/strstream.h b/include/c++/stlport/using/h/strstream.h similarity index 100% rename from include/stlport/using/h/strstream.h rename to include/c++/stlport/using/h/strstream.h diff --git a/include/stlport/using/iomanip b/include/c++/stlport/using/iomanip similarity index 100% rename from include/stlport/using/iomanip rename to include/c++/stlport/using/iomanip diff --git a/include/stlport/using/ios b/include/c++/stlport/using/ios similarity index 100% rename from include/stlport/using/ios rename to include/c++/stlport/using/ios diff --git a/include/stlport/using/iosfwd b/include/c++/stlport/using/iosfwd similarity index 100% rename from include/stlport/using/iosfwd rename to include/c++/stlport/using/iosfwd diff --git a/include/stlport/using/iostream b/include/c++/stlport/using/iostream similarity index 100% rename from include/stlport/using/iostream rename to include/c++/stlport/using/iostream diff --git a/include/stlport/using/istream b/include/c++/stlport/using/istream similarity index 100% rename from include/stlport/using/istream rename to include/c++/stlport/using/istream diff --git a/include/stlport/using/locale b/include/c++/stlport/using/locale similarity index 100% rename from include/stlport/using/locale rename to include/c++/stlport/using/locale diff --git a/include/stlport/using/ostream b/include/c++/stlport/using/ostream similarity index 100% rename from include/stlport/using/ostream rename to include/c++/stlport/using/ostream diff --git a/include/stlport/using/sstream b/include/c++/stlport/using/sstream similarity index 100% rename from include/stlport/using/sstream rename to include/c++/stlport/using/sstream diff --git a/include/stlport/using/streambuf b/include/c++/stlport/using/streambuf similarity index 100% rename from include/stlport/using/streambuf rename to include/c++/stlport/using/streambuf diff --git a/include/stlport/using/strstream b/include/c++/stlport/using/strstream similarity index 100% rename from include/stlport/using/strstream rename to include/c++/stlport/using/strstream diff --git a/include/stlport/utility b/include/c++/stlport/utility similarity index 100% rename from include/stlport/utility rename to include/c++/stlport/utility diff --git a/include/stlport/valarray b/include/c++/stlport/valarray similarity index 100% rename from include/stlport/valarray rename to include/c++/stlport/valarray diff --git a/include/stlport/vector b/include/c++/stlport/vector similarity index 100% rename from include/stlport/vector rename to include/c++/stlport/vector diff --git a/include/stlport/wchar.h b/include/c++/stlport/wchar.h similarity index 100% rename from include/stlport/wchar.h rename to include/c++/stlport/wchar.h diff --git a/include/stlport/wctype.h b/include/c++/stlport/wctype.h similarity index 100% rename from include/stlport/wctype.h rename to include/c++/stlport/wctype.h diff --git a/include/crt/float.h b/include/crt/float.h index 38fcf7183ff..a542686948c 100644 --- a/include/crt/float.h +++ b/include/crt/float.h @@ -104,12 +104,12 @@ extern "C" { /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ +__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -123,8 +123,8 @@ _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __MINGW_NOTHROW _fpreset (void); -void __cdecl __MINGW_NOTHROW fpreset (void); +__MINGW_NOTHROW void __cdecl _fpreset (void); +__MINGW_NOTHROW void __cdecl fpreset (void); /* Global 'variable' for the current floating point error code. */ __MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); @@ -135,15 +135,15 @@ __MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void); * but they really belong in math.h. */ -_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); -_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); -_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); +__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double); +__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double); +__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long); -_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); -_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double); +__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double); #ifdef __cplusplus }