reflect reality, those types must match libc.

and then, we can have a default facet when locales are not
defined.

(this lets std::istringstream work again)

2 files changed, 4 insertions, 4 deletions

diff --git a/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_base.h b/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
index e3a3e04e1cd..9d81614d8c4 100644
--- a/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
+++ b/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_base.h
@@ -41,11 +41,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   struct ctype_base
   {
     // Non-standard typedefs.
-    typedef const int* 		__to_type;
+    typedef const short* 	__to_type;
 
     // NB: Offsets into ctype<char>::_M_table force a particular size
     // on the mask type. Because of this, we don't use an enum.
-    typedef unsigned long 	mask;
+    typedef char 		mask;
     static const mask upper     = _U;
     static const mask lower     = _L;
     static const mask alpha     = _U | _L;
diff --git a/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_noninline.h b/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_noninline.h
index f7dd5334e61..4a012320bbb 100644
--- a/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_noninline.h
+++ b/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/ctype_noninline.h
@@ -46,7 +46,7 @@
 		     size_t __refs) 
   : facet(__refs), _M_del(__table != 0 && __del), 
   _M_toupper(NULL), _M_tolower(NULL), 
-  _M_table(__table ? __table : classic_table()) 
+  _M_table(__table ? __table : _ctype_ + 1)
   { 
     memset(_M_widen, 0, sizeof(_M_widen));
     _M_widen_ok = 0;
@@ -57,7 +57,7 @@
   ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
   : facet(__refs), _M_del(__table != 0 && __del), 
   _M_toupper(NULL), _M_tolower(NULL), 
-  _M_table(__table ? __table : classic_table()) 
+  _M_table(__table ? __table : _ctype_ + 1) 
   { 
     memset(_M_widen, 0, sizeof(_M_widen));
     _M_widen_ok = 0;