From: Bruno Haible Date: Wed, 26 Nov 2003 11:19:46 +0000 (+0000) Subject: Use size_t instead of ssize_t where possible. X-Git-Tag: v0.13~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=220a284d231d6d271f03f91f47a4600ffab15870;p=thirdparty%2Fgettext.git Use size_t instead of ssize_t where possible. --- diff --git a/ChangeLog b/ChangeLog index 69db3d062..e57c60d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-11-23 Bruno Haible + + * PACKAGING: Remove ssize_t.m4. + 2003-11-16 Bruno Haible * PACKAGING: Add size_max.m4, ssize_t.m4, xsize.m4. diff --git a/PACKAGING b/PACKAGING index 677984ddb..e65abf58a 100644 --- a/PACKAGING +++ b/PACKAGING @@ -133,7 +133,6 @@ following file list. $prefix/share/aclocal/progtest.m4 $prefix/share/aclocal/signed.m4 $prefix/share/aclocal/size_max.m4 - $prefix/share/aclocal/ssize_t.m4 $prefix/share/aclocal/stdint_h.m4 $prefix/share/aclocal/uintmax_t.m4 $prefix/share/aclocal/ulonglong.m4 diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 1d13498bb..af5bac440 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,19 @@ +2003-11-23 Paul Eggert + Bruno Haible + + * printf-parse.h: Don't include sys/types.h. + (ARG_NONE): New macro. + (char_directive): Change type of *arg_index fields to size_t. + * wprintf-parse.h: Don't include sys/types.h. + (ARG_NONE): New macro. + (wchar_t_directive): Change type of *arg_index fields to size_t. + * printf-parse.c: Don't include sys/types.h. + (SSIZE_MAX): Remove macro. + (PRINTF_PARSE): Change the type of the arg_index variables to size_t. + Remove unnecessary overflow check. + * vasnprintf.c (VASNPRINTF): Update for type change of *arg_index + fields. + 2003-11-17 Bruno Haible * vasnprintf.c (alloca): Remove fallback definition. diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c index d760960c1..d19f903d7 100644 --- a/gettext-runtime/intl/printf-parse.c +++ b/gettext-runtime/intl/printf-parse.c @@ -30,9 +30,6 @@ /* Get size_t, NULL. */ #include -/* Get ssize_t. */ -#include - /* Get intmax_t. */ #if HAVE_STDINT_H_WITH_UINTMAX # include @@ -47,10 +44,6 @@ /* Checked size_t computations. */ #include "xsize.h" -#ifndef SSIZE_MAX -# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) -#endif - #if WIDE_CHAR_VERSION # define PRINTF_PARSE wprintf_parse # define CHAR_T wchar_t @@ -70,7 +63,7 @@ int PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) { const CHAR_T *cp = format; /* pointer into format */ - ssize_t arg_posn = 0; /* number of regular arguments consumed */ + size_t arg_posn = 0; /* number of regular arguments consumed */ size_t d_allocated; /* allocated elements of d->dir */ size_t a_allocated; /* allocated elements of a->arg */ size_t max_width_length = 0; @@ -124,7 +117,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) CHAR_T c = *cp++; if (c == '%') { - ssize_t arg_index = -1; + size_t arg_index = ARG_NONE; DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */ /* Initialize the next directive. */ @@ -132,11 +125,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) dp->flags = 0; dp->width_start = NULL; dp->width_end = NULL; - dp->width_arg_index = -1; + dp->width_arg_index = ARG_NONE; dp->precision_start = NULL; dp->precision_end = NULL; - dp->precision_arg_index = -1; - dp->arg_index = -1; + dp->precision_arg_index = ARG_NONE; + dp->arg_index = ARG_NONE; /* Test for positional argument. */ if (*cp >= '0' && *cp <= '9') @@ -154,7 +147,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; arg_index = n - 1; @@ -224,18 +217,18 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; dp->width_arg_index = n - 1; cp = np + 1; } } - if (dp->width_arg_index < 0) + if (dp->width_arg_index == ARG_NONE) { dp->width_arg_index = arg_posn++; - if (dp->width_arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->width_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->width_arg_index, TYPE_INT); @@ -281,7 +274,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; @@ -289,11 +282,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) cp = np + 1; } } - if (dp->precision_arg_index < 0) + if (dp->precision_arg_index == ARG_NONE) { dp->precision_arg_index = arg_posn++; - if (dp->precision_arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->precision_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->precision_arg_index, TYPE_INT); @@ -492,11 +485,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (type != TYPE_NONE) { dp->arg_index = arg_index; - if (dp->arg_index < 0) + if (dp->arg_index == ARG_NONE) { dp->arg_index = arg_posn++; - if (dp->arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->arg_index, type); @@ -512,9 +505,6 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) DIRECTIVE *memory; d_allocated = xtimes (d_allocated, 2); - if (size_overflow_p (d_allocated)) - /* Overflow, would lead to out of memory. */ - goto error; memory_size = xtimes (d_allocated, sizeof (DIRECTIVE)); if (size_overflow_p (memory_size)) /* Overflow, would lead to out of memory. */ diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h index 754aaf2e5..8aec50e2a 100644 --- a/gettext-runtime/intl/printf-parse.h +++ b/gettext-runtime/intl/printf-parse.h @@ -21,9 +21,6 @@ #include "printf-args.h" -/* Get ssize_t. */ -#include - /* Flags */ #define FLAG_GROUP 1 /* ' flag */ @@ -33,6 +30,9 @@ #define FLAG_ALT 16 /* # flag */ #define FLAG_ZERO 32 +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + /* A parsed directive. */ typedef struct { @@ -41,12 +41,12 @@ typedef struct int flags; const char* width_start; const char* width_end; - ssize_t width_arg_index; + size_t width_arg_index; const char* precision_start; const char* precision_end; - ssize_t precision_arg_index; + size_t precision_arg_index; char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ - ssize_t arg_index; + size_t arg_index; } char_directive; diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c index 05a08bcfb..8a62282d7 100644 --- a/gettext-runtime/intl/vasnprintf.c +++ b/gettext-runtime/intl/vasnprintf.c @@ -223,7 +223,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar { size_t augmented_length; - if (!(dp->arg_index < 0)) + if (!(dp->arg_index == ARG_NONE)) abort (); augmented_length = xsum (length, 1); ENSURE_ALLOCATION (augmented_length); @@ -232,7 +232,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar } else { - if (!(dp->arg_index >= 0)) + if (!(dp->arg_index != ARG_NONE)) abort (); if (dp->conversion == 'n') @@ -280,7 +280,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar width = 0; if (dp->width_start != dp->width_end) { - if (dp->width_arg_index >= 0) + if (dp->width_arg_index != ARG_NONE) { int arg; @@ -302,7 +302,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar precision = 6; if (dp->precision_start != dp->precision_end) { - if (dp->precision_arg_index >= 0) + if (dp->precision_arg_index != ARG_NONE) { int arg; @@ -564,13 +564,13 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar /* Construct the arguments for calling snprintf or sprintf. */ prefix_count = 0; - if (dp->width_arg_index >= 0) + if (dp->width_arg_index != ARG_NONE) { if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; } - if (dp->precision_arg_index >= 0) + if (dp->precision_arg_index != ARG_NONE) { if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) abort (); diff --git a/gettext-runtime/intl/wprintf-parse.h b/gettext-runtime/intl/wprintf-parse.h index 549865fd6..24a2cfc28 100644 --- a/gettext-runtime/intl/wprintf-parse.h +++ b/gettext-runtime/intl/wprintf-parse.h @@ -21,9 +21,6 @@ #include "printf-args.h" -/* Get ssize_t. */ -#include - /* Flags */ #define FLAG_GROUP 1 /* ' flag */ @@ -33,6 +30,9 @@ #define FLAG_ALT 16 /* # flag */ #define FLAG_ZERO 32 +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + /* A parsed directive. */ typedef struct { @@ -41,12 +41,12 @@ typedef struct int flags; const wchar_t* width_start; const wchar_t* width_end; - ssize_t width_arg_index; + size_t width_arg_index; const wchar_t* precision_start; const wchar_t* precision_end; - ssize_t precision_arg_index; + size_t precision_arg_index; wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */ - ssize_t arg_index; + size_t arg_index; } wchar_t_directive; diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 85faef96a..30f576500 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,17 @@ +2003-11-23 Paul Eggert + Bruno Haible + + * printf-parse.h: Don't include sys/types.h. + (ARG_NONE): New macro. + (char_directive): Change type of *arg_index fields to size_t. + * printf-parse.c: Don't include sys/types.h. + (SSIZE_MAX): Remove macro. + (PRINTF_PARSE): Change the type of the arg_index variables to size_t. + Remove unnecessary overflow check. + * vasnprintf.c (VASNPRINTF): Update for type change of *arg_index + fields. + * configure.ac: Don't invoke gt_TYPE_SSIZE_T. + 2003-11-19 Bruno Haible * configure.ac: Better test for ptrdiff_t. Invoke gt_TYPE_SSIZE_T and diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index d08c9c9c7..00ec3945b 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -57,7 +57,6 @@ AC_CHECK_TYPE([ptrdiff_t], , [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) ]) gt_TYPE_INTMAX_T -gt_TYPE_SSIZE_T gl_XSIZE dnl Checks for library functions. diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c index d760960c1..d19f903d7 100644 --- a/gettext-runtime/libasprintf/printf-parse.c +++ b/gettext-runtime/libasprintf/printf-parse.c @@ -30,9 +30,6 @@ /* Get size_t, NULL. */ #include -/* Get ssize_t. */ -#include - /* Get intmax_t. */ #if HAVE_STDINT_H_WITH_UINTMAX # include @@ -47,10 +44,6 @@ /* Checked size_t computations. */ #include "xsize.h" -#ifndef SSIZE_MAX -# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) -#endif - #if WIDE_CHAR_VERSION # define PRINTF_PARSE wprintf_parse # define CHAR_T wchar_t @@ -70,7 +63,7 @@ int PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) { const CHAR_T *cp = format; /* pointer into format */ - ssize_t arg_posn = 0; /* number of regular arguments consumed */ + size_t arg_posn = 0; /* number of regular arguments consumed */ size_t d_allocated; /* allocated elements of d->dir */ size_t a_allocated; /* allocated elements of a->arg */ size_t max_width_length = 0; @@ -124,7 +117,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) CHAR_T c = *cp++; if (c == '%') { - ssize_t arg_index = -1; + size_t arg_index = ARG_NONE; DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */ /* Initialize the next directive. */ @@ -132,11 +125,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) dp->flags = 0; dp->width_start = NULL; dp->width_end = NULL; - dp->width_arg_index = -1; + dp->width_arg_index = ARG_NONE; dp->precision_start = NULL; dp->precision_end = NULL; - dp->precision_arg_index = -1; - dp->arg_index = -1; + dp->precision_arg_index = ARG_NONE; + dp->arg_index = ARG_NONE; /* Test for positional argument. */ if (*cp >= '0' && *cp <= '9') @@ -154,7 +147,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; arg_index = n - 1; @@ -224,18 +217,18 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; dp->width_arg_index = n - 1; cp = np + 1; } } - if (dp->width_arg_index < 0) + if (dp->width_arg_index == ARG_NONE) { dp->width_arg_index = arg_posn++; - if (dp->width_arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->width_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->width_arg_index, TYPE_INT); @@ -281,7 +274,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (n == 0) /* Positional argument 0. */ goto error; - if (size_overflow_p (n) || n - 1 > SSIZE_MAX) + if (size_overflow_p (n)) /* n too large, would lead to out of memory later. */ goto error; @@ -289,11 +282,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) cp = np + 1; } } - if (dp->precision_arg_index < 0) + if (dp->precision_arg_index == ARG_NONE) { dp->precision_arg_index = arg_posn++; - if (dp->precision_arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->precision_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->precision_arg_index, TYPE_INT); @@ -492,11 +485,11 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (type != TYPE_NONE) { dp->arg_index = arg_index; - if (dp->arg_index < 0) + if (dp->arg_index == ARG_NONE) { dp->arg_index = arg_posn++; - if (dp->arg_index < 0) - /* arg_posn wrapped around at SSIZE_MAX. */ + if (dp->arg_index == ARG_NONE) + /* arg_posn wrapped around. */ goto error; } REGISTER_ARG (dp->arg_index, type); @@ -512,9 +505,6 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) DIRECTIVE *memory; d_allocated = xtimes (d_allocated, 2); - if (size_overflow_p (d_allocated)) - /* Overflow, would lead to out of memory. */ - goto error; memory_size = xtimes (d_allocated, sizeof (DIRECTIVE)); if (size_overflow_p (memory_size)) /* Overflow, would lead to out of memory. */ diff --git a/gettext-runtime/libasprintf/printf-parse.h b/gettext-runtime/libasprintf/printf-parse.h index 754aaf2e5..8aec50e2a 100644 --- a/gettext-runtime/libasprintf/printf-parse.h +++ b/gettext-runtime/libasprintf/printf-parse.h @@ -21,9 +21,6 @@ #include "printf-args.h" -/* Get ssize_t. */ -#include - /* Flags */ #define FLAG_GROUP 1 /* ' flag */ @@ -33,6 +30,9 @@ #define FLAG_ALT 16 /* # flag */ #define FLAG_ZERO 32 +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + /* A parsed directive. */ typedef struct { @@ -41,12 +41,12 @@ typedef struct int flags; const char* width_start; const char* width_end; - ssize_t width_arg_index; + size_t width_arg_index; const char* precision_start; const char* precision_end; - ssize_t precision_arg_index; + size_t precision_arg_index; char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ - ssize_t arg_index; + size_t arg_index; } char_directive; diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c index 05a08bcfb..8a62282d7 100644 --- a/gettext-runtime/libasprintf/vasnprintf.c +++ b/gettext-runtime/libasprintf/vasnprintf.c @@ -223,7 +223,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar { size_t augmented_length; - if (!(dp->arg_index < 0)) + if (!(dp->arg_index == ARG_NONE)) abort (); augmented_length = xsum (length, 1); ENSURE_ALLOCATION (augmented_length); @@ -232,7 +232,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar } else { - if (!(dp->arg_index >= 0)) + if (!(dp->arg_index != ARG_NONE)) abort (); if (dp->conversion == 'n') @@ -280,7 +280,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar width = 0; if (dp->width_start != dp->width_end) { - if (dp->width_arg_index >= 0) + if (dp->width_arg_index != ARG_NONE) { int arg; @@ -302,7 +302,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar precision = 6; if (dp->precision_start != dp->precision_end) { - if (dp->precision_arg_index >= 0) + if (dp->precision_arg_index != ARG_NONE) { int arg; @@ -564,13 +564,13 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar /* Construct the arguments for calling snprintf or sprintf. */ prefix_count = 0; - if (dp->width_arg_index >= 0) + if (dp->width_arg_index != ARG_NONE) { if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; } - if (dp->precision_arg_index >= 0) + if (dp->precision_arg_index != ARG_NONE) { if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) abort (); diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index f40f7c34d..bceef1bce 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2003-11-23 Bruno Haible + + * ssize_t.m4: Remove file, moved to ../../gettext-tools/m4/. + * gettext.m4 (AM_INTL_SUBDIR): Don't require gt_TYPE_SSIZE_T. + * Makefile.am (EXTRA_DIST): Remove ssize_t.m4. + 2003-11-19 Bruno Haible * size_max.m4 (gl_SIZE_MAX): Don't use the _ONCE macros here. diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am index bf9f24fb3..aadecfe40 100644 --- a/gettext-runtime/m4/Makefile.am +++ b/gettext-runtime/m4/Makefile.am @@ -23,7 +23,6 @@ printf-posix.m4 \ progtest.m4 \ signed.m4 \ size_max.m4 \ -ssize_t.m4 \ stdint_h.m4 \ uintmax_t.m4 \ ulonglong.m4 \ diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index cfa6dddd8..a374f03fa 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 27 (gettext-0.13) +# gettext.m4 serial 28 (gettext-0.13) dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -373,7 +373,6 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gt_TYPE_SSIZE_T])dnl AC_REQUIRE([gl_XSIZE])dnl AC_CHECK_TYPE([ptrdiff_t], , diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index e1c648084..e6960681d 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,7 @@ +2003-11-23 Bruno Haible + + * gettext.texi (aclocal): Don't mention ssize_t.m4. + 2003-11-16 Bruno Haible * gettext.texi (aclocal): Mention size_max.m4, ssize_t.m4, xsize.m4. diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 88e4cb339..badb609e7 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -6511,8 +6511,8 @@ the simplest is to concatenate the files @file{codeset.m4}, @file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4}, @file{longdouble.m4}, @file{longlong.m4}, @file{printf-posix.m4}, @file{progtest.m4}, @file{signed.m4}, @file{size_max.m4}, -@file{ssize_t.m4}, @file{stdint_h.m4}, @file{uintmax_t.m4}, -@file{ulonglong.m4}, @file{wchar_t.m4}, @file{wint_t.m4}, @file{xsize.m4} +@file{stdint_h.m4}, @file{uintmax_t.m4}, @file{ulonglong.m4}, +@file{wchar_t.m4}, @file{wint_t.m4}, @file{xsize.m4} from GNU @code{gettext}'s @file{m4/} directory into a single file. If you have suppressed the @file{intl/} directory, only @file{gettext.m4}, @file{iconv.m4}, diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index ca6e95c07..4620e2a67 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,9 @@ +2003-11-23 Bruno Haible + + * ssize_t.m4: New file, moved here from ../../gettext-runtime/m4/. + * Makefile.am (aclocal_DATA): Remove ssize_t.m4. + (EXTRA_DIST): Add ssize_t.m4. + 2003-11-16 Bruno Haible * size_max.m4: Remove file, moved to ../../gettext-runtime/m4/. diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 364faa8f1..8c6fdea1c 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -26,7 +26,6 @@ aclocal_DATA = \ ../../gettext-runtime/m4/progtest.m4 \ ../../gettext-runtime/m4/signed.m4 \ ../../gettext-runtime/m4/size_max.m4 \ - ../../gettext-runtime/m4/ssize_t.m4 \ ../../gettext-runtime/m4/stdint_h.m4 \ ../../gettext-runtime/m4/uintmax_t.m4 \ ../../gettext-runtime/m4/ulonglong.m4 \ @@ -70,6 +69,7 @@ setlocale.m4 \ sig_atomic_t.m4 \ siginfo.m4 \ signalblocking.m4 \ +ssize_t.m4 \ stdbool.m4 \ strerror.m4 \ strerror_r.m4 \ diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index f5bb3025f..addbf2649 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,7 @@ +2003-11-23 Bruno Haible + + * gettextize.in (m4filelist): Remove ssize_t.m4. + 2003-11-16 Bruno Haible * gettextize.in (m4filelist): Add size_max.m4, ssize_t.m4, xsize.m4. diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 7a1ac5136..97ae140d8 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -641,13 +641,12 @@ $do_changelog && func_poChangeLog_finish m4filelist=' codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 - printf-posix.m4 progtest.m4 signed.m4 size_max.m4 ssize_t.m4 stdint_h.m4 - uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4' + printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 + ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4' # We cannot omit codeset.m4, glibc21.m4, intdiv0.m4, intmax.m4, inttypes.m4, # inttypes_h.m4, inttypes-pri.m4, isc-posix.m4, lcmessage.m4, longdouble.m4, # longlong.m4, nls.m4, po.m4, printf-posix.m4, signed.m4, size_max.m4, -# ssize_t.m4, stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4, -# xsize.m4 +# stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4, xsize.m4 # if test -z "$intldir", otherwise "aclocal -I m4" might give an error. # (aclocal doesn't know which macros are really needed, it looks which macros # are potentially needed.)