acconfig.h: Revert.

2000-08-24  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* acconfig.h: Revert.
	* acinclude.m4: Revert.
	* libio/_G_config.h: Revert.
	* libio/libio.h: Revert.

From-SVN: r35943

libstdc++-v3/acconfig.h

@@ -69,24 +69,6 @@
 // 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/acinclude.m4

@@ -131,11 +131,9 @@ LIB_AC_PROG_CXX
   # fails, because we are probably configuring with a cross compiler
   # which cant create executables.  So we include AC_EXEEXT to keep
   # automake happy, but we dont execute it, since we dont care about
-  # the result.  We must, however, execute something else to prevent sh
-  # from complaining about an empty body.
+  # the result.
   if false; then
     AC_EXEEXT
-    :
   fi
 
   # configure.host sets the following important variables
@@ -895,19 +893,12 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
 dnl
 dnl Check to see if this target can enable the wchar_t parts of libstdc++.
 dnl
-dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found.
-dnl Define _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h.
-dnl
-dnl All of the above depends on --enable-wchar (the default).
+dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found 
+dnl Define _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h
 dnl
 dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
 AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
 
-  AC_MSG_CHECKING([if wide character support is requested])
-  GLIBCPP_ENABLE_WCHAR([yes])
-  AC_MSG_RESULT($enable_wchar)
-  if test x"$enable_wchar" = xyes; then
-
   dnl Sanity check for existence of ISO C9X headers for extended encoding.
   AC_CHECK_HEADER(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
   AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
@@ -990,8 +981,6 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
     AC_MSG_WARN([<wchar.h> not found])
     AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
   fi
-
-  fi
 ])
 
 
@@ -1203,8 +1192,6 @@ dnl Check for which I/O library to use:  libio, or something specific.
 dnl
 dnl GLIBCPP_ENABLE_CSTDIO
 dnl --enable-cstdio=libio sets config/c_io_libio.h and friends
-dnl --enable-cstdio=wince sets config/c_io_wince.h and friends, but those
-dnl                                    need to be written by somebody.
 dnl 
 dnl default is libio
 dnl
@@ -1216,12 +1203,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
   if test x$enable_cstdio = xno; then
     enable_cstdio=libio
   fi,
-     enable_cstdio=libio
-  )
+     enable_cstdio=libio)
 
   enable_cstdio_flag=$enable_cstdio
 
-  dnl Check if a valid I/O package
+  dnl Check if a valid thread package
   case x${enable_cstdio_flag} in
     xlibio | x | xno | xnone | xyes)
       # default
@@ -1289,25 +1275,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
   AC_LINK_FILES($CCODECVT_C, libio/c_codecvt.c)
   # 2000-08-04 bkoz hack
 	
-  # 2000-08-22 pme kludge -- if building libio, then probably need these
-  #   typedefs which are used in _G_config.h
-  if test $need_libio = yes; then
-    AC_CHECK_TYPE(__off_t,off_t)
-    # off64_t should already be there, but just in case...
-    AC_CHECK_TYPE(off64_t,off_t)
-    AC_CHECK_TYPE(__off64_t,off64_t)
-    AC_CHECK_TYPE(__ssize_t,ssize_t)
-    AC_TRY_COMPILE([#include <sys/types.h>
-                    #include <sys/stat.h>],
-                   [struct stat64 s;],
-                   , dnl Nothing need be done if it's present
-                   [dnl Not entirely comfortable with this
-                    AC_DEFINE(stat64,stat)
-                   ]
-    )
-  fi
-  # 2000-08-22 pme kludge
-
   AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_XTRA_LIBIO, test "$need_xtra_libio" = yes)
   AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
@@ -1404,9 +1371,6 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
   AC_SUBST(THREADOBJS)
   AC_SUBST(THREADSPEC)
   AC_LINK_FILES(config/$THREADH, bits/c++threads.h)
-  if test "$THREADS" != none; then
-     AC_DEFINE(_GLIBCPP_USING_THREADS)
-  fi
 ])
 
 
@@ -1618,7 +1582,6 @@ dnl string, '#' otherwise
   AC_SUBST(ifGNUmake)
 ])
 
-
 sinclude(../libtool.m4)
 dnl The lines below arrange for aclocal not to bring an installed
 dnl libtool.m4 into aclocal.m4, while still arranging for automake to
@@ -1628,31 +1591,3 @@ AC_DEFUN([AM_PROG_LIBTOOL])
 AC_DEFUN([AC_LIBTOOL_DLOPEN])
 AC_DEFUN([AC_PROG_LD])
 ])
\ No newline at end of file
-
-
-dnl
-dnl Check whether the user wants wide character support.
-dnl
-dnl GLIBCPP_ENABLE_WCHAR
-dnl --enable-wchar [does stuff].
-dnl --disable-wchar [does not do stuff].
-dnl  +  Usage:  GLIBCPP_ENABLE_WCHAR[(DEFAULT)]
-dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
-dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_WCHAR, [dnl
-define([GLIBCPP_ENABLE_WCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
-AC_ARG_ENABLE(wchar,
-changequote(<<, >>)dnl
-<<  --enable-wchar          turns on wide character support [default=>>GLIBCPP_ENABLE_WCHAR_DEFAULT],
-changequote([, ])dnl
-[case "$enableval" in
- yes) enable_wchar=yes ;;
- no)  enable_wchar=no ;;
- *)   AC_MSG_ERROR([Unknown argument to enable/disable wchar]) ;;
- esac],
-enable_wchar=GLIBCPP_ENABLE_WCHAR_DEFAULT)dnl
-dnl We don't set things in the external files; other configure tests will
-dnl use $enable_wchar ("yes"/"no") for their own work.
-])
-
-

libstdc++-v3/libio/_G_config.h

@@ -6,16 +6,11 @@
 
 #ifndef _LIBC
 # include <bits/c++config.h>
-# 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