diff -rw stlport/config/stl_watcom.h stlport-4.5.3/config/stl_watcom.h
3d2
< // Modified version for STLPort Version 4.5.2 for OpenWatcom compatibility
22,26d20
< // herbert: with OpenWatcom 1.2 the stuff below does not work!
< # if __WATCOMC__ > 1100
< # define _STLP_NO_WATCOM_INLINE_INTERLOCK 
< # endif
< 
100d93
< #  define _STLP_HAS_NO_NAMESPACES 1
101a95
> #  define _STLP_HAS_NO_NAMESPACES 1
104d97
< // herbert: This should allow us writing "using namespace std;" with OpenWatcom
diff -rw stlport/stl/_string.h stlport-4.5.3/stl/_string.h
97,102d96
< // herbert: Fix for OpenWatcom [http://ghost.isa.ru/assa/watcom/stlport.html]
< #ifdef __WATCOMC__
<   bool operator()(const typename _Traits::char_type& __x) const {
<     return find_if(_M_first, _M_last, _Eq_char_bound<_Traits>(__x)) == _M_last;
<   }
< #else
107d100
< #endif
diff -rw stlport/stl/_tree.c stlport-4.5.3/stl/_tree.c
41,45d40
< // herbert: Fix for OpenWatcom [http://ghost.isa.ru/assa/watcom/stlport.html]
< #  ifdef __WATCOMC__
< #   define __iterator__ _Rb_tree_iterator<_Value,_Nonconst_traits<_Value>  >
< #   define __size_type__ size_t
< #  else
47c42
< #  endif
---
> #  define iterator __iterator__
diff -rw stlport/stl_user_config.h stlport-4.5.3/stl_user_config.h
45,48c45,46
< // herbert: Fix for OpenWatcom [http://ghost.isa.ru/assa/watcom/stlport.html]
< #ifdef __WATCOMC__
< # define   _STLP_NO_OWN_IOSTREAMS	1
< #endif
---
> // # define   _STLP_NO_OWN_IOSTREAMS	1
>