*** misc/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Jul  3 09:22:27 2003
--- misc/build/STLport-4.5/src/gcc-3.0-macosx.mak	Thu Jul  3 09:20:26 2003
***************
*** 1 ****
! dummy
--- 1,59 ----
! #
! # Note : this makefile is for gcc-3, Mac OS X only !
! #
! 
! #
! # compiler
! # take these from the OOo build environment
! CC*= gcc 
! CXX*= g++
! 
! #
! # Basename for libraries
! #
! LIB_BASENAME = libstlport_gcc
! 
! #
! # guts for common stuff
! #
! #
! LINK=libtool -static -o
! DYN_LINK=libtool -dynamic -framework System -lcc_dynamic -lstdc++ -install_name @executable_path/$(@F) -o
! 
! OBJEXT=o
! DYNEXT=dylib
! STEXT=a
! RM=rm -rf
! PATH_SEP=/
! MKDIR=mkdir -p
! COMP=GCC$(ARCH)
! INSTALL_STEP = install_unix 
! 
! all:  all_dynamic all_static symbolic_links 
! 
! include common_macros.mak
! 
! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -Wno-long-double
! 
! CXXFLAGS_COMMON =  -I${STLPORT_DIR} -D_REENTRANT -D_PTHREADS -ftemplate-depth-32 -malign-natural -no-cpp-precomp -fexceptions ${WARNING_FLAGS}
! 
! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
! 
! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
! 
! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
! 
! include common_percent_rules.mak
! include common_rules.mak
! 
! 
! #install: all
! #	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
! 
! #%.s: %.cpp
! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
! 
! 
*** misc/STLport-4.5/src/gcc-3.0.mak	Thu Jul  3 09:22:27 2003
--- misc/build/STLport-4.5/src/gcc-3.0.mak	Thu Jul  3 09:20:26 2003
***************
*** 1 ****
! dummy
--- 1,59 ----
! #
! # Note : this makefile is for gcc-3 !
! #
! 
! #
! # compiler
! # take these from the OOo build environment
! CC*= gcc 
! CXX*= g++
! 
! #
! # Basename for libraries
! #
! LIB_BASENAME = libstlport_gcc
! 
! #
! # guts for common stuff
! #
! #
! LINK=ar cr
! DYN_LINK=$(CXX) --fexceptions -shared -o
! 
! OBJEXT=o
! DYNEXT=so
! STEXT=a
! RM=rm -rf
! PATH_SEP=/
! MKDIR=mkdir -p
! COMP=GCC$(ARCH)
! INSTALL_STEP = install_unix 
! 
! all:  all_dynamic all_static symbolic_links 
! 
! include common_macros.mak
! 
! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
! 
! CXXFLAGS_COMMON =  -D_REENTRANT -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS}
! 
! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
! 
! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
! 
! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
! 
! include common_percent_rules.mak
! include common_rules.mak
! 
! 
! #install: all
! #	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
! 
! #%.s: %.cpp
! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
! 
! 
*** misc/STLport-4.5/src/gcc-freebsd.mak	Sat Jul 28 22:36:25 2001
--- misc/build/STLport-4.5/src/gcc-freebsd.mak	Thu Jul  3 09:20:26 2003
***************
*** 5,12 ****
  #
  # compiler
  #
! CC = gcc -pthread
! CXX = c++ -pthread -fexceptions
  
  #
  # Basename for libraries
--- 5,12 ----
  #
  # compiler
  #
! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
  
  #
  # Basename for libraries
***************
*** 19,25 ****
  #
  LINK=ar cr
  # 2.95 flag
! DYN_LINK=c++ -pthread -fexceptions -shared -o
  
  OBJEXT=o
  DYNEXT=so
--- 19,25 ----
  #
  LINK=ar cr
  # 2.95 flag
! DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
  
  OBJEXT=o
  DYNEXT=so
***************
*** 41,48 ****
  
  CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
  
! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
  
  CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
  CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
--- 41,48 ----
  
  CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
  
! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
  
  CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
  CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
*** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 12:10:16 2001
--- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jul  3 09:23:22 2003
***************
*** 75,80 ****
--- 75,82 ----
  
  #  define __unix
  
+ # if ( __GNUC__ < 3 )
+ 
   /* Mac OS X needs one and only one source file to initialize all static data
    * members in template classes. Only one source file in an executable or
    * library can declare instances for such data members, otherwise duplicate
***************
*** 88,94 ****
  
  /* Mac OS X needs all "::" scope references to be "std::" */
  #  undef _STLP_VENDOR_GLOBAL_STD
! #  undef _STLP_VENDOR_GLOBAL_CSTD
  #  define _STLP_NO_CSTD_FUNCTION_IMPORTS
   /* Workaround for the broken Mac OS X C++ preprocessor which cannot handle
    * parameterized macros in #include statements */
--- 90,96 ----
  
  /* Mac OS X needs all "::" scope references to be "std::" */
  #  undef _STLP_VENDOR_GLOBAL_STD
! #  undef _STLP_VENDOR_GLOBAL_CSTD 
  #  define _STLP_NO_CSTD_FUNCTION_IMPORTS
   /* Workaround for the broken Mac OS X C++ preprocessor which cannot handle
    * parameterized macros in #include statements */
***************
*** 97,103 ****
  #  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##>
! # endif
  
  
  # if defined(__BEOS__) && defined(__INTEL__)
--- 99,106 ----
  #  define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##>
  #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##>
! # endif   /* __GNUC__ < 3 */
! # endif   /* __APPLE__ */
  
  
  # if defined(__BEOS__) && defined(__INTEL__)
***************
*** 226,233 ****
  
  # if (__GNUC__ >= 3)
  
! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
  
  # elif (__GNUC_MINOR__ < 8)
  
--- 229,238 ----
  
  # if (__GNUC__ >= 3)
  
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
! #  define _STLP_NATIVE_INCLUDE_PATH /usr/include/gcc/darwin/3.3/c++
! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
!           /usr/include/gcc/darwin/3.3/c++/backward
  
  # elif (__GNUC_MINOR__ < 8)
  
*** misc/STLport-4.5/stlport/cwchar	Fri Jan 26 19:39:42 2001
--- misc/build/STLport-4.5/stlport/cwchar	Thu Jul  3 09:20:26 2003
***************
*** 21,26 ****
--- 21,29 ----
  #  include <stl/_prolog.h>
  # endif
  
+ #ifdef __FreeBSD__
+ # include <../wchar.h>
+ #endif
  # include <stl/_cwchar.h>
  
  # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
*** misc/STLport-4.5/stlport/stdexcept	Mon May 21 19:50:21 2001
--- misc/build/STLport-4.5/stlport/stdexcept	Thu Jul  3 09:20:26 2003
***************
*** 49,54 ****
--- 49,61 ----
  
  _STLP_BEGIN_NAMESPACE
  
+ 
+ #if defined( __GNUC__)
+ #undef _STLP_NOTHROW_INHERENTLY
+ #define _STLP_NOTHROW_INHERENTLY throw()
+ #endif
+  
+ 
  class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
  public:
    __Named_exception(const string& __str)