ctype_inline.h (is): Use __OBJ_DATA directly.

2000-10-26  David Edelsohn  <dje@watson.ibm.com>

	* config/os/aix/bits/ctype_inline.h (is): Use __OBJ_DATA directly.
        * config/os/aix/bits/ctype_noninline.h (do_tolower): Fix typo.
        * config/os/aix/bits/os_defines.h: Add AIX defines.

From-SVN: r37074

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1a09f546de11bfe24b23255a897af768ae612c49..85e4fcade0ba2252503e35e1a00a655a41781062 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-26  David Edelsohn  <dje@watson.ibm.com> 
+        
+       * config/os/aix/bits/ctype_inline.h (is): Use __OBJ_DATA directly.
+        * config/os/aix/bits/ctype_noninline.h (do_tolower): Fix typo.
+        * config/os/aix/bits/os_defines.h: Add AIX defines.
+
 2000-10-26  Benjamin Kosnik  <bkoz@redhat.com>
 
        * acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): Remove.

diff --git a/libstdc++-v3/config/os/aix/bits/ctype_inline.h b/libstdc++-v3/config/os/aix/bits/ctype_inline.h
index 2083a174a4bab91b8a94f7e615f2468644a4d7e3..06a42112bfc5c47e9180b66f9efec2ce6ef1be40 100644 (file)
--- a/libstdc++-v3/config/os/aix/bits/ctype_inline.h
+++ b/libstdc++-v3/config/os/aix/bits/ctype_inline.h
@@ -37,7 +37,7 @@
   bool
   ctype<char>::
   is(mask __m, char __c) const throw()
-  { return _IS(__c, __m); }
+  { return __OBJ_DATA(__lc_ctype)->mask[__c] & __m; }
 
   const char*
   ctype<char>::

diff --git a/libstdc++-v3/config/os/aix/bits/ctype_noninline.h b/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
index c4e82b784c572dabde146cd4cec73cf6ada096fb..c58fbaa7f7cc205aa68b7e7adef4c1aab72b6ae1 100644 (file)
--- a/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
@@ -57,7 +57,7 @@
 
   char
   ctype<char>::do_tolower(char __c) const
-  { return _tolower(__a); }
+  { return _tolower(__c); }
 
   const char* 
   ctype<char>::do_tolower(char* __low, const char* __high) const

diff --git a/libstdc++-v3/config/os/aix/bits/os_defines.h b/libstdc++-v3/config/os/aix/bits/os_defines.h
index d012d24a8f157b0a325144f7f3c26627e2feba24..ac9bf140e3204e04151cc888d976790f432d3d56 100644 (file)
--- a/libstdc++-v3/config/os/aix/bits/os_defines.h
+++ b/libstdc++-v3/config/os/aix/bits/os_defines.h
@@ -27,14 +27,30 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
-
+#define _GLIBCPP_OS_DEFINES
 
 /* System-specific #define, typedefs, corrections, etc, go here.  This
    file will come before all others. */
 
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+#undef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED 1
+
+/* off64_t */
+#ifndef _LARGE_FILE_API
+#define _LARGE_FILE_API
+#endif
+
+/* atomic types */
+#ifndef _ALL_SOURCE
+#define _ALL_SOURCE
+#endif
+
+#define __off_t off_t
+#define __off64_t off64_t
+#define __ssize_t ssize_t
 
 #endif