--- nxcomp/Types.h.orig	2004-08-10 10:47:11.000000000 +0200
+++ nxcomp/Types.h	2004-09-13 18:55:58.408469032 +0200
@@ -74,21 +74,21 @@
 
   void clear()
   {
-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
 
-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
+    #if defined(_VECTOR_H)
 
-    _Destroy(_M_start, _M_finish);
+    _Destroy(_M_impl._M_start, _M_impl._M_finish);
 
     #else
 
-    destroy(_M_start, _M_finish);
+    destroy(_M_impl._M_start, _M_impl._M_finish);
 
     #endif
 
-    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
 
-    _M_start = _M_finish = _M_end_of_storage = 0;
+    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
 
     #else
 
@@ -108,21 +108,21 @@
 
   void clear()
   {
-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
 
-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
+    #if defined(_VECTOR_H)
 
-    _Destroy(_M_start, _M_finish);
+    _Destroy(_M_impl._M_start, _M_impl._M_finish);
 
     #else
 
-    destroy(_M_start, _M_finish);
+    destroy(_M_impl._M_start, _M_impl._M_finish);
 
     #endif
 
-    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
 
-    _M_start = _M_finish = _M_end_of_storage = 0;
+    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
 
     #else