diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | iconvdata/Makefile | 13 | ||||
| -rw-r--r-- | iconvdata/iso646.c | 2 | ||||
| -rw-r--r-- | intl/dcgettext.c | 6 | ||||
| -rw-r--r-- | manual/stdio.texi | 6 | ||||
| -rw-r--r-- | string/string.h | 3 |
6 files changed, 29 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 9cbdb3b078..9db145ae7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +1998-04-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * iconvdata/Makefile ($(objpfx)iconv-test.out): Use this as target + instead of do-iconv-test. + ($(objpfx)gconv-modules): Define rule only if objpfx is not + empty. + +1998-04-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * string/string.h: Fix feature test. + +1998-04-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * iconvdata/iso646.c (BODY): Don't use character constants that + depend on signedness of char. + 1998-04-27 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/Makefile [$(subdirs)=misc] diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 80d9a08a97..56cef22705 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -475,13 +475,14 @@ endif include ../Rules -.PHONY: do-iconv-test -tests: do-iconv-test +tests: $(objpfx)iconv-test.out -do-iconv-test: run-iconv-test.sh $(objpfx)gconv-modules \ - $(addprefix $(objpfx),$(modules.so)) \ - $(common-objdir)/iconv/iconv_prog - $(SHELL) -e $< $(common-objdir) > $(objpfx)iconv-test.out +$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ + $(addprefix $(objpfx),$(modules.so)) \ + $(common-objdir)/iconv/iconv_prog + $(SHELL) -e $< $(common-objdir) > $@ +ifdef objpfx $(objpfx)gconv-modules: gconv-modules cp $^ $@ +endif diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index d3eaa77834..29a452d112 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -391,7 +391,7 @@ gconv_end (struct gconv_step *data) break; \ default: \ break; \ - case '\x80' ... '\xff': \ + case 0x80 ... 0xff: \ /* Illegal character. */ \ failure = GCONV_ILLEGAL_INPUT; \ break; \ diff --git a/intl/dcgettext.c b/intl/dcgettext.c index 3557202ea5..a79c1f52e2 100644 --- a/intl/dcgettext.c +++ b/intl/dcgettext.c @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. @@ -142,10 +142,6 @@ static char *stpcpy PARAMS ((char *dest, const char *src)); # define PATH_MAX _POSIX_PATH_MAX #endif -#ifndef internal_function -# define internal_function -#endif - /* XPG3 defines the result of `setlocale (category, NULL)' as: ``Directs `setlocale()' to query `category' and return the current setting of `local'.'' diff --git a/manual/stdio.texi b/manual/stdio.texi index 7b56787e95..84b2ffd1cb 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -1545,12 +1545,12 @@ make_message (char *name, char *value) @group if (nchars >= size) @{ - /* @r{Reallocate buffer now that we know + /* @r{Reallocate buffer now that we know how much space is needed.} */ buffer = (char *) xrealloc (buffer, nchars + 1); /* @r{Try again.} */ - snprintf (buffer, size, "value of %s is %s", + snprintf (buffer, size, "value of %s is %s", name, value); @} /* @r{The last call worked, return the string.} */ @@ -1727,7 +1727,7 @@ eprintf (const char *template, ...) extern char *program_invocation_short_name; fprintf (stderr, "%s: ", program_invocation_short_name); - va_start (ap, count); + va_start (ap, template); vfprintf (stderr, template, ap); va_end (ap); @} diff --git a/string/string.h b/string/string.h index 15491f8629..266a5d518e 100644 --- a/string/string.h +++ b/string/string.h @@ -216,8 +216,7 @@ extern char *strerror_r __P ((int __errnum, char *__buf, size_t __buflen)); the namespace rules does not allow this. */ extern void __bzero __P ((__ptr_t __s, size_t __n)); -#if defined __USE_BSD || (defined __USE_XOPEN_EXTENDED \ - && (_POSIX_C_SOURCE - 0) < 199506L) +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ extern void bcopy __P ((__const __ptr_t __src, __ptr_t __dest, size_t __n)); |