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.


Mods based on the modifications used in GNU grep 2.2 to make gnu-regex.c
compile on other OSes.
This commit is contained in:
Jason Molenda 1998-06-10 21:08:38 +00:00
parent a4122443af
commit 9ed669cf76
5 changed files with 48 additions and 26 deletions

View file

@ -51,31 +51,9 @@
/* For platform which support the ISO C amendement 1 functionality we
support user defined character classes. */
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
# include <wctype.h>
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
# include <wchar.h>
/* We have to keep the namespace clean. */
# define regfree(preg) __regfree (preg)
# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
# define regerror(errcode, preg, errbuf, errbuf_size) \
__regerror(errcode, preg, errbuf, errbuf_size)
# define re_set_registers(bu, re, nu, st, en) \
__re_set_registers (bu, re, nu, st, en)
# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
__re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
# define re_match(bufp, string, size, pos, regs) \
__re_match (bufp, string, size, pos, regs)
# define re_search(bufp, string, size, startpos, range, regs) \
__re_search (bufp, string, size, startpos, range, regs)
# define re_compile_pattern(pattern, length, bufp) \
__re_compile_pattern (pattern, length, bufp)
# define re_set_syntax(syntax) __re_set_syntax (syntax)
# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
#define btowc __btowc
# include <wctype.h>
#endif
/* This is for other GNU distributions with internationalized messages. */