acconfig.h: _GLIBCPP_USING_THREADS and some workaround types added.

2000-08-23  Phil Edwards  <pme@sourceware.cygnus.com>

	* acconfig.h:  _GLIBCPP_USING_THREADS and some workaround types added.
	* acinclude.m4:  New macro, GLIBCPP_ENABLE_WCHAR.  Set the threads
	  definition as well, and some minor spelling/spacing fixes.  If
	  building libio, check for certain typedefs.
	* libio/_G_config.h:  Wrap _IO_MTSAFE_IO in _GLIBCPP_USING_THREADS.
	  Conditionally define _LARGEFILE64_SOURCE, otherwise the 64-bit types
	  will never be there.
	* libio/libio.h:  In the null case, _IO_lock_t can't just be void.
	* src/string-inst.cc:  Use _GLIBCPP_USE_WCHAR_T.

	* configure.in:  Update the cache a bit more often.

	* mkcheck.in:  For check-install, also need to -I the testsuite dir.

From-SVN: r35901

libstdc++-v3/ChangeLog

+2000-08-23  Phil Edwards  <pme@sourceware.cygnus.com>
+
+	* acconfig.h:  _GLIBCPP_USING_THREADS and some workaround types added.
+	* acinclude.m4:  New macro, GLIBCPP_ENABLE_WCHAR.  Set the threads
+	  definition as well, and some minor spelling/spacing fixes.  If
+	  building libio, check for certain typedefs.
+	* libio/_G_config.h:  Wrap _IO_MTSAFE_IO in _GLIBCPP_USING_THREADS.
+	  Conditionally define _LARGEFILE64_SOURCE, otherwise the 64-bit types
+	  will never be there.
+	* libio/libio.h:  In the null case, _IO_lock_t can't just be void.
+	* src/string-inst.cc:  Use _GLIBCPP_USE_WCHAR_T.
+
+	* configure.in:  Update the cache a bit more often.
+
+	* mkcheck.in:  For check-install, also need to -I the testsuite dir.
+
 2000-08-22  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
 	* src/locale-inst.cc: Add codecvt<unicode_t, wchar_t,

libstdc++-v3/acconfig.h

@@ -69,6 +69,24 @@
 // Define if modf is present in <math.h>
 #undef HAVE_MODF
 
+// Define if multiple threads are to be taken into account.
+#undef _GLIBCPP_USING_THREADS
+
+// Define to some workaround if not directly available.
+#undef off64_t
+
+// Define to some workaround if not directly available.
+#undef __off_t
+
+// Define to some workaround if not directly available.
+#undef __off64_t
+
+// Define to some workaround if not directly available.
+#undef __ssize_t
+
+// Define to regular stat if not directly supported.
+#undef stat64
+
 // @BOTTOM@
 //
 // Systems that have certain non-standard functions prefixed with an

libstdc++-v3/config.h.in

@@ -3,6 +3,9 @@
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
 
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
 // Include support for 'long long' and 'unsigned long long'.
 #undef _GLIBCPP_USE_LONG_LONG
 
@@ -72,6 +75,24 @@
 // Define if modf is present in <math.h>
 #undef HAVE_MODF
 
+// Define if multiple threads are to be taken into account.
+#undef _GLIBCPP_USING_THREADS
+
+// Define to some workaround if not directly available.
+#undef off64_t
+
+// Define to some workaround if not directly available.
+#undef __off_t
+
+// Define to some workaround if not directly available.
+#undef __off64_t
+
+// Define to some workaround if not directly available.
+#undef __ssize_t
+
+// Define to regular stat if not directly supported.
+#undef stat64
+
 /* Define if you have the _acosf function.  */
 #undef HAVE__ACOSF
 

libstdc++-v3/configure.in

@@ -28,6 +28,8 @@ AM_CONFIG_HEADER(config.h)
 GLIBCPP_CHECK_COMPILER_VERSION
 GLIBCPP_CHECK_CPU
 
+AC_CACHE_SAVE
+
 # Enable all the crazy c++ stuff.
 GLIBCPP_ENABLE_DEBUG
 GLIBCPP_ENABLE_CSTDIO
@@ -116,6 +118,7 @@ else
   GLIBCPP_CHECK_MATH_SUPPORT
   GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
   GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
+  AC_CACHE_SAVE
   GLIBCPP_CHECK_WCHAR_T_SUPPORT
   GLIBCPP_CHECK_CTYPE
 

libstdc++-v3/libio/_G_config.h

@@ -6,11 +6,16 @@
 
 #ifndef _LIBC
 # include <bits/c++config.h>
-# define _IO_MTSAFE_IO
+# ifdef _GLIBCPP_USING_THREADS
+#  define _IO_MTSAFE_IO
+# endif
 #endif
 
 /* Define types for libio in terms of the standard internal type names.  */
 
+#ifndef _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
+#endif
 #include <sys/types.h>
 #define __need_size_t
 #define __need_wchar_t

libstdc++-v3/libio/libio.h

@@ -164,7 +164,7 @@ struct _IO_jump_t;  struct _IO_FILE;
 /*# include <comthread.h>*/
 # endif
 #else
-typedef void _IO_lock_t;
+typedef void* _IO_lock_t;
 #endif
 
 

libstdc++-v3/mkcheck.in

@@ -57,7 +57,7 @@ fi
 if [ $WHICH != "1" ]; then
   INC_PATH="@CSHADOWFLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio -I$SRC_DIR/@ctype_include_dir@ -I$SRC_DIR/@cpu_include_dir@  -I$SRC_DIR/std -I$SRC_DIR -I$SRC_DIR/libio -I$SRC_DIR/testsuite"
 elif [ $WHICH -eq 1 ]; then
-  INC_PATH=""
+  INC_PATH="-I$SRC_DIR/testsuite"
 fi
 
 if [ $WHICH -eq 2 ]; then

libstdc++-v3/src/string-inst.cc

@@ -209,7 +209,7 @@ namespace std
       const char* __ret = strchr(__beg, __c); 
       return (__ret ? __ret : __end);
     }
-#else
+#elif defined(_GLIBCPP_USE_WCHAR_T)
   template<>
     const wchar_t* 
     wstring::_S_find(const wchar_t* __beg, const wchar_t* __end, wchar_t __c)