STLport: Reduce a patch.

1 files changed, 4 insertions, 131 deletions

diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index b29fe35ed5a4..5843c1fa3e23 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -684,143 +684,16 @@
    __Named_exception(const string& __str) 
 --- misc/STLport-4.5/stlport/stl/_bvector.h	2001-05-30 05:45:41.000000000 +0200
 +++ misc/build/STLport-4.5/stlport/stl/_bvector.h	2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,9 @@
  # include <stl/_vector.h>
  # endif
  
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#ifndef __WORD_BIT
+ #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#endif
  
  _STLP_BEGIN_NAMESPACE 
  
-@@ -80,7 +80,7 @@
-   unsigned int  _M_offset;
- 
-   void _M_bump_up() {
--    if (_M_offset++ == __WORD_BIT - 1) {
-+    if (_M_offset++ == ___WORD_BIT - 1) {
-       _M_offset = 0;
-       ++_M_p;
-     }
-@@ -88,7 +88,7 @@
- 
-   void _M_bump_down() {
-     if (_M_offset-- == 0) {
--      _M_offset = __WORD_BIT - 1;
-+      _M_offset = ___WORD_BIT - 1;
-       --_M_p;
-     }
-   }
-@@ -100,17 +100,17 @@
- 
-   void _M_advance (difference_type __i) {
-     difference_type __n = __i + _M_offset;
--    _M_p += __n / __WORD_BIT;
--    __n = __n % __WORD_BIT;
-+    _M_p += __n / ___WORD_BIT;
-+    __n = __n % ___WORD_BIT;
-     if (__n < 0) {
--      _M_offset = (unsigned int) __n + __WORD_BIT;
-+      _M_offset = (unsigned int) __n + ___WORD_BIT;
-       --_M_p;
-     } else
-       _M_offset = (unsigned int) __n;
-   }
- 
-   difference_type _M_subtract(const _Bit_iterator_base& __x) const {
--    return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+    return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-   }
- };
- 
-@@ -242,7 +242,7 @@
- protected:
- 
-   unsigned int* _M_bit_alloc(size_t __n) 
--    { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+    { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
-   void _M_deallocate() {
-     if (_M_start._M_p)
-       _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
- 
-   void _M_initialize(size_type __n) {
-     unsigned int* __q = this->_M_bit_alloc(__n);
--    this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+    this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     this->_M_start = iterator(__q, 0);
-     this->_M_finish = this->_M_start + difference_type(__n);
-   }
-@@ -352,13 +352,13 @@
-       ++this->_M_finish;
-     }
-     else {
--      size_type __len = size() ? 2 * size() : __WORD_BIT;
-+      size_type __len = size() ? 2 * size() : ___WORD_BIT;
-       unsigned int* __q = this->_M_bit_alloc(__len);
-       iterator __i = copy(begin(), __position, iterator(__q, 0));
-       *__i++ = __x;
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -411,7 +411,7 @@
-         __i = copy(__first, __last, __i);
-         this->_M_finish = copy(__position, end(), __i);
-         this->_M_deallocate();
--        this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+        this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-         this->_M_start = iterator(__q, 0);
-       }
-     }
-@@ -609,7 +609,7 @@
-       this->_M_finish = copy(begin(), end(), __z);
-       this->_M_deallocate();
-       this->_M_start = iterator(__q, 0);
--      this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     }
-   }
- 
-@@ -681,7 +681,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -702,7 +702,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -722,7 +722,7 @@
-       fill_n(__i, __n, __x);
-       this->_M_finish = copy(__position, end(), __i + difference_type(__n));
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
- 
--# undef __WORD_BIT
-+# undef ___WORD_BIT
- 
- #endif /* _STLP_INTERNAL_BVECTOR_H */
- 
 --- misc/STLport-4.5/stlport/stl/_complex.h	2001-07-06 06:16:17.000000000 +0200
 +++ misc/build/STLport-4.5/stlport/stl/_complex.h	2008-07-18 14:13:49.000000000 +0200
 @@ -18,6 +18,10 @@