Wed Jun 10 14:06:05 1998 Jason Molenda (crash@bugshack.cygnus.com)

* configure.in: Add some tests for gnu-regex.c's benefit.
        See if btowc() function is provided in C library.
        * configure, config.in: Regenerated.
        * Makefile.in (CLIBS, CDEPS): Add @LIBOBJS@ to build btowc.c
        if necessary.
        * btowc.c: New file.

        * gnu-regex.c: Reorder wchar.h and wctype.h includes for Solaris'
        benefit.
        Drop namespace preserving defines for now.

gdb/Makefile.in

@@ -250,9 +250,9 @@ INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty \
 	-lmmalloc -lintl -liberty
 CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(INTL) $(LIBIBERTY) \
 	$(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
-	$(MMALLOC) $(LIBIBERTY) $(WIN32LIBS)
+	$(MMALLOC) $(LIBIBERTY) $(WIN32LIBS) @LIBOBJS@
 CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
-	$(OPCODES) $(MMALLOC) $(INTL_DEPS) $(LIBIBERTY) @CONFIG_DEPS@
+	$(OPCODES) $(MMALLOC) $(INTL_DEPS) $(LIBIBERTY) @CONFIG_DEPS@ @LIBOBJS@
 
 ADD_FILES = $(REGEX) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 ADD_DEPS = $(REGEX1) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)

gdb/btowc.c

@@ -0,0 +1,34 @@
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdio.h>
+#include <wchar.h>
+
+
+/* We use UTF8 encoding for multibyte strings and therefore a valid
+   one byte multibyte string only can have a value from 0 to 0x7f.  */
+wint_t
+btowc (c)
+     int c;
+{
+  if (WEOF != (wint_t) EOF || c < 0 || c > 0x7f)
+    return WEOF;
+  else
+    return (wint_t) c;
+}