*** misc/STLport-4.5/src/dll_main.cpp	2001-08-24 21:14:19.000000000 -0400
--- misc/build/STLport-4.5/src/dll_main.cpp	2004-04-23 10:11:11.673840410 -0400
***************
*** 147,152 ****
--- 147,156 ----
  template struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
  # endif
  
+ #ifdef __APPLE__
+ template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<false,0>;
+ template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<true,0>;
+ #endif
  template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
  template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
  template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
*** misc/STLport-4.5/src/gcc-3.0-freebsd.mak	2004-04-23 10:12:13.363230779 -0400
--- misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	2004-04-23 10:11:11.675840099 -0400
***************
*** 1 ****
! dummy
--- 1,59 ----
! #
! # Note : this makefile is for gcc-3 !
! #
! 
! #
! # compiler
! #
! CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
! CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
! 
! #
! # Basename for libraries
! #
! LIB_BASENAME = libstlport_gcc
! 
! #
! # guts for common stuff
! #
! #
! LINK=ar cr
! DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o
! 
! OBJEXT=o
! DYNEXT=so
! STEXT=a
! RM=rm -rf
! PATH_SEP=/
! MKDIR=mkdir -p
! COMP=GCC-FREEBSD
! 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 = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${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
! 
! 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-macosx.mak	2004-04-23 10:12:13.339234516 -0400
--- misc/build/STLport-4.5/src/gcc-3.0-macosx.mak	2004-04-23 10:11:11.676839943 -0400
***************
*** 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=g++ -dynamiclib -single_module -install_name @executable_path/libstlport_gcc.dylib -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} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -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	2004-04-23 10:12:13.277244172 -0400
--- misc/build/STLport-4.5/src/gcc-3.0.mak	2004-04-23 10:11:11.678839632 -0400
***************
*** 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 -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -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	2001-07-28 23:36:25.000000000 -0400
--- misc/build/STLport-4.5/src/gcc-freebsd.mak	2004-04-23 10:11:11.679839476 -0400
***************
*** 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
***************
*** 39,48 ****
  
  WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
  
! 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
--- 39,48 ----
  
  WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
  
! CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${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	2001-09-04 13:10:16.000000000 -0400
--- misc/build/STLport-4.5/stlport/config/stl_gcc.h	2004-04-23 10:11:11.681839164 -0400
***************
*** 7,13 ****
--- 7,15 ----
  # define _STLP_USE_GLIBC
  #endif
  
+ # if (__GNUC_MINOR__ < 4)  && (__GNUC__ >= 3)
  #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
+ # endif
  
  # if defined(__FreeBSD__) || defined (__hpux)
  #  define _STLP_NO_WCHAR_T
***************
*** 75,80 ****
--- 77,84 ----
  
  #  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
***************
*** 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__)
--- 101,123 ----
  #  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##>
! 
! # else
! /* Mac OS X using gcc 3.3 handles all well */
! #   undef  _STLP_NO_STATIC_TEMPLATE_DATA
! #   define _STLP_STATIC_TEMPLATE_DATA 1
! #   define _STLP_WEAK_ATTRIBUTE 1
! #   undef _STLP_NO_LONG_DOUBLE
! 
! #if 0
!  /* Mac OS X needs all "::" scope references to be "std::" */
!  #  define _STLP_NO_CSTD_FUNCTION_IMPORTS
!  #  undef _STLP_VENDOR_GLOBAL_STD
!  #  undef _STLP_VENDOR_GLOBAL_CSTD
! #endif
! 
! # 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)
  
--- 246,270 ----
  
  # if (__GNUC__ >= 3)
  
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
! #ifdef i386
! #undef i386
! #define i386 i386
! #endif
! 
! #ifdef mips
! #undef mips
! #define mips mips
! #endif
! 
! #ifdef sgi
! #undef sgi
! #define sgi sgi
! #endif
! 
! #  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
!           GXX_INCLUDE_PATH/backward
  
  # elif (__GNUC_MINOR__ < 8)
  
*** misc/STLport-4.5/stlport/cwchar	2001-01-26 20:39:42.000000000 -0500
--- misc/build/STLport-4.5/stlport/cwchar	2004-04-23 10:11:11.682839009 -0400
***************
*** 21,26 ****
--- 21,29 ----
  #  include <stl/_prolog.h>
  # endif
  
+ #ifdef __FreeBSD__
+ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
  # include <stl/_cwchar.h>
  
  # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
*** misc/STLport-4.5/stlport/stdexcept	2001-05-21 20:50:21.000000000 -0400
--- misc/build/STLport-4.5/stlport/stdexcept	2004-04-23 10:11:11.683838853 -0400
***************
*** 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) 
*** misc/STLport-4.5/stlport/stl/_ios_base.h	2001-09-04 13:10:18.000000000 -0400
--- misc/build/STLport-4.5/stlport/stl/_ios_base.h	2004-04-23 10:12:09.276867306 -0400
***************
*** 291,297 ****
  template <class Facet>
  locale::facet* _M_get_facet(ios_base& __i, Facet*)
  {
! 
  }
  
  // ----------------------------------------------------------------------
--- 291,297 ----
  template <class Facet>
  locale::facet* _M_get_facet(ios_base& __i, Facet*)
  {
!     return NULL;
  }
  
  // ----------------------------------------------------------------------
*** misc/STLport-4.5/stlport/stl/_threads.h	2001-09-04 13:10:20.000000000 -0400
--- misc/build/STLport-4.5/stlport/stl/_threads.h	2004-04-23 10:11:11.685838541 -0400
***************
*** 42,49 ****
  #  include <cstdlib>
  # endif
  
! // On SUN and Mac OS X gcc, zero-initialization works just fine...
! # if defined (__sun) || ( defined(__GNUC__) && defined(__APPLE__) )
  # define _STLP_MUTEX_INITIALIZER
  # endif
  
--- 42,49 ----
  #  include <cstdlib>
  # endif
  
! // On SUN zero-initialization works just fine...
! # if defined (__sun)
  # define _STLP_MUTEX_INITIALIZER
  # endif