[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
shishi ./configure.ac gl/Makefile.am gl/argp.h ...
|
From: |
shishi-commit |
|
Subject: |
shishi ./configure.ac gl/Makefile.am gl/argp.h ... |
|
Date: |
Sun, 14 Sep 2003 17:10:12 -0400 |
CVSROOT: /cvsroot/shishi
Module name: shishi
Branch:
Changes by: Simon Josefsson <address@hidden> 03/09/14 17:10:11
Modified files:
. : configure.ac
gl : Makefile.am argp.h error.c exitfail.c getopt.c
getopt.h getopt1.c malloc.c memmove.c memset.c
mktime.c realloc.c setenv.c strchrnul.c
strdup.c strndup.c strnlen.c unsetenv.c
vasnprintf.c xmalloc.c
gl/m4 : Makefile.am error.m4 exitfail.m4 extensions.m4
getopt.m4 mktime.m4 setenv.m4 strchrnul.m4
strdup.m4 strndup.m4 strnlen.m4 xalloc.m4
Added files:
gl : exit.h
Log message:
Upstream sync.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/configure.ac.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/exit.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/Makefile.am.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/argp.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/error.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/exitfail.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/getopt.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/getopt.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/getopt1.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/malloc.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/memmove.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/memset.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/mktime.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/realloc.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/setenv.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/strchrnul.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/strdup.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/strndup.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/strnlen.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/unsetenv.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/vasnprintf.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/xmalloc.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/error.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/exitfail.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/extensions.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/getopt.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/mktime.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/setenv.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/strchrnul.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/strdup.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/strndup.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/strnlen.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/gl/m4/xalloc.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: shishi/configure.ac
diff -u shishi/configure.ac:1.86 shishi/configure.ac:1.87
--- shishi/configure.ac:1.86 Sun Sep 14 13:45:04 2003
+++ shishi/configure.ac Sun Sep 14 17:10:11 2003
@@ -77,7 +77,6 @@
])
# For gnulib stuff in gl/.
-gl_C_RESTRICT
gl_FUNC_ALLOCA
gl_ARGP
gl_ERROR
@@ -90,8 +89,8 @@
gl_FUNC_MEMPCPY
gl_FUNC_MEMSET
gl_FUNC_MKTIME
-gl_FUNC_TIMEGM
jm_FUNC_REALLOC
+gl_C_RESTRICT
gt_FUNC_SETENV
gl_STRCASE
gl_FUNC_STRCHRNUL
@@ -100,12 +99,13 @@
gl_FUNC_STRNDUP
gl_FUNC_STRNLEN
gl_SYSEXITS
+gl_FUNC_TIMEGM
+gl_TIME_R
jm_FUNC_GLIBC_UNLOCKED_IO
gl_FUNC_VASNPRINTF
gl_FUNC_VASPRINTF
gl_XALLOC
gl_XSTRNDUP
-gl_TIME_R
# Checks for library functions.
AC_FUNC_STRFTIME
Index: shishi/gl/Makefile.am
diff -u shishi/gl/Makefile.am:1.18 shishi/gl/Makefile.am:1.19
--- shishi/gl/Makefile.am:1.18 Sat Sep 6 18:24:14 2003
+++ shishi/gl/Makefile.am Sun Sep 14 17:10:11 2003
@@ -1,9 +1,11 @@
-# strnlen strndup mempcpy alloca argp error gethostname getopt memmove memset
realloc setenv strcase strchrnul strdup strerror sysexits vasprintf vasnprintf
xalloc getdate timegm
+# strnlen strndup mempcpy alloca argp error gethostname getopt memmove memset
realloc setenv strcase strchrnul strdup strerror sysexits vasprintf vasnprintf
xalloc xstrndup getdate timegm
# + base64 (x)memdup
+
+# s/#libfoo_la_LIBADD = @LIBOBJS@/libfoo_la_LIBADD = @LTLIBOBJS@/g
# s/libfoo_a/libfoo_la/g
# s/libfoo.a/libfoo.la/
-# s/#libfoo_la_LIBADD = @LIBOBJS@/libfoo_la_LIBADD = @LTLIBOBJS@/g
# s/EXTRA_DIST =/EXTRA_DIST = README/
+# s/noinst_LIBRARIES/noinst_LTLIBRARIES/g
SUBDIRS = m4
@@ -14,7 +16,7 @@
noinst_LTLIBRARIES = libfoo.la
libfoo_la_SOURCES =
-#libfoo_la_LIBADD = @LIBOBJS@
+#libfoo_a_LIBADD = @LIBOBJS@
libfoo_la_LIBADD = @LTLIBOBJS@
EXTRA_DIST = README
BUILT_SOURCES =
@@ -41,6 +43,8 @@
argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c
+libfoo_la_SOURCES += exit.h
+
libfoo_la_SOURCES += exitfail.h exitfail.c
@@ -60,6 +64,7 @@
+
libfoo_la_SOURCES += setenv.h
@@ -67,6 +72,7 @@
+libfoo_la_SOURCES += strndup.h
EXTRA_DIST += sysexit_.h
@@ -79,6 +85,10 @@
mv sysexits.h-t sysexits.h
MOSTLYCLEANFILES += sysexits.h sysexits.h-t
+libfoo_la_SOURCES += timegm.h
+
+libfoo_la_SOURCES += time_r.h
+
libfoo_la_SOURCES += unlocked-io.h
libfoo_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
@@ -89,14 +99,7 @@
libfoo_la_SOURCES += xstrndup.h xstrndup.c
-libfoo_la_SOURCES += strndup.h
libfoo_la_SOURCES += base64.c base64.h
-
-libfoo_la_SOURCES += timegm.h
-
-libfoo_la_SOURCES += time_r.h
-
libfoo_la_SOURCES += memdup.h memdup.c
-
libfoo_la_SOURCES += xmemdup.h xmemdup.c
Index: shishi/gl/argp.h
diff -u shishi/gl/argp.h:1.5 shishi/gl/argp.h:1.6
--- shishi/gl/argp.h:1.5 Fri Aug 22 14:05:42 2003
+++ shishi/gl/argp.h Sun Sep 14 17:10:11 2003
@@ -461,10 +461,10 @@
ARGP_HELP_*. */
extern void argp_help (__const struct argp *__restrict __argp,
FILE *__restrict __stream,
- unsigned __flags, char *__restrict __name) __THROW;
+ unsigned __flags, char *__restrict __name);
extern void __argp_help (__const struct argp *__restrict __argp,
FILE *__restrict __stream, unsigned __flags,
- char *__name) __THROW;
+ char *__name);
/* The following routines are intended to be called from within an argp
parsing routine (thus taking an argp_state structure as the first
@@ -478,23 +478,23 @@
from the set ARGP_HELP_*. */
extern void argp_state_help (__const struct argp_state *__restrict __state,
FILE *__restrict __stream,
- unsigned int __flags) __THROW;
+ unsigned int __flags);
extern void __argp_state_help (__const struct argp_state *__restrict __state,
FILE *__restrict __stream,
- unsigned int __flags) __THROW;
+ unsigned int __flags);
/* Possibly output the standard usage message for ARGP to stderr and exit. */
-extern void argp_usage (__const struct argp_state *__state) __THROW;
-extern void __argp_usage (__const struct argp_state *__state) __THROW;
+extern void argp_usage (__const struct argp_state *__state);
+extern void __argp_usage (__const struct argp_state *__state);
/* If appropriate, print the printf string FMT and following args, preceded
by the program name and `:', to stderr, and followed by a `Try ... --help'
message, then exit (1). */
extern void argp_error (__const struct argp_state *__restrict __state,
- __const char *__restrict __fmt, ...) __THROW
+ __const char *__restrict __fmt, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
extern void __argp_error (__const struct argp_state *__restrict __state,
- __const char *__restrict __fmt, ...) __THROW
+ __const char *__restrict __fmt, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
/* Similar to the standard gnu error-reporting function error(), but will
@@ -507,11 +507,11 @@
parsing but don't reflect a (syntactic) problem with the input. */
extern void argp_failure (__const struct argp_state *__restrict __state,
int __status, int __errnum,
- __const char *__restrict __fmt, ...) __THROW
+ __const char *__restrict __fmt, ...)
__attribute__ ((__format__ (__printf__, 4, 5)));
extern void __argp_failure (__const struct argp_state *__restrict __state,
int __status, int __errnum,
- __const char *__restrict __fmt, ...) __THROW
+ __const char *__restrict __fmt, ...)
__attribute__ ((__format__ (__printf__, 4, 5)));
/* Returns true if the option OPT is a valid short option. */
Index: shishi/gl/error.c
diff -u shishi/gl/error.c:1.3 shishi/gl/error.c:1.4
--- shishi/gl/error.c:1.3 Tue Sep 9 05:00:50 2003
+++ shishi/gl/error.c Sun Sep 14 17:10:11 2003
@@ -132,11 +132,10 @@
static void
error_tail (int status, int errnum, const char *message, va_list args)
{
-# if HAVE_VPRINTF || _LIBC
-# if _LIBC
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
{
-# define ALLOCA_LIMIT 2000
+# define ALLOCA_LIMIT 2000
size_t len = strlen (message) + 1;
wchar_t *wmessage = NULL;
mbstate_t st;
@@ -174,21 +173,18 @@
__vfwprintf (stderr, wmessage, args);
}
else
-# endif
+#endif
vfprintf (stderr, message, args);
-# else
- _doprnt (message, args, stderr);
-# endif
va_end (args);
++error_message_count;
if (errnum)
print_errno_message (errnum);
-# if _LIBC
+#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
putwc (L'\n', stderr);
else
-# endif
+#endif
putc ('\n', stderr);
fflush (stderr);
if (status)
@@ -200,7 +196,6 @@
format string with optional args.
If ERRNUM is nonzero, print its corresponding system error message.
Exit with status STATUS if it is nonzero. */
-/* VARARGS */
void
error (int status, int errnum, const char *message, ...)
{
Index: shishi/gl/exitfail.c
diff -u shishi/gl/exitfail.c:1.2 shishi/gl/exitfail.c:1.3
--- shishi/gl/exitfail.c:1.2 Tue Sep 9 05:00:50 2003
+++ shishi/gl/exitfail.c Sun Sep 14 17:10:11 2003
@@ -21,9 +21,7 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include "exitfail.h"
+#include "exit.h"
int volatile exit_failure = EXIT_FAILURE;
Index: shishi/gl/getopt.c
diff -u shishi/gl/getopt.c:1.1 shishi/gl/getopt.c:1.2
--- shishi/gl/getopt.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/getopt.c Sun Sep 14 17:10:11 2003
@@ -2,8 +2,11 @@
NOTE: getopt is now part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to address@hidden
before changing it!
- Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
- Free Software Foundation, Inc.
+
+ Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
+ Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -30,14 +33,6 @@
# include <config.h>
#endif
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-# ifndef const
-# define const
-# endif
-#endif
-
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not
@@ -68,11 +63,10 @@
# include <unistd.h>
#endif /* GNU C library. */
+#include <string.h>
+
#ifdef VMS
# include <unixlib.h>
-# if HAVE_STRING_H - 0
-# include <string.h>
-# endif
#endif
#ifdef _LIBC
@@ -193,20 +187,7 @@
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
-#ifdef __GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-# include <string.h>
-# define my_index strchr
-#else
-
-# if HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
+#ifndef __GNU_LIBRARY__
/* Avoid depending on library functions or files
whose names are inconsistent. */
@@ -215,32 +196,6 @@
extern char *getenv ();
#endif
-static char *
-my_index (str, chr)
- const char *str;
- int chr;
-{
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it. */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- That was relevant to code that was here before. */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
- and has done so at least since version 2.4.5. -- rms. */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
#endif /* not __GNU_LIBRARY__ */
/* Handle permutation of arguments. */
@@ -294,13 +249,8 @@
`first_nonopt' and `last_nonopt' are relocated so that they describe
the new indices of the non-options in ARGV after they are moved. */
-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
static void
-exchange (argv)
- char **argv;
+exchange (char **argv)
{
int bottom = first_nonopt;
int middle = last_nonopt;
@@ -380,14 +330,8 @@
/* Initialize the internal data when the first call is made. */
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
static const char *
-_getopt_initialize (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
+_getopt_initialize (int argc, char *const *argv, const char *optstring)
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
is the program name); the sequence of previously skipped
@@ -506,13 +450,9 @@
long-named options. */
int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
- int argc;
- char *const *argv;
- const char *optstring;
- const struct option *longopts;
- int *longind;
- int long_only;
+_getopt_internal (int argc, char *const *argv,
+ const char *optstring, const struct option *longopts,
+ int *longind, int long_only)
{
int print_errors = opterr;
if (optstring[0] == ':')
@@ -637,7 +577,8 @@
if (longopts != NULL
&& (argv[optind][1] == '-'
- || (long_only && (argv[optind][2] || !my_index (optstring,
argv[optind][1])))))
+ || (long_only
+ && (argv[optind][2] || !strchr (optstring, argv[optind][1])))))
{
char *nameend;
const struct option *p;
@@ -822,7 +763,7 @@
option, then it's an error.
Otherwise interpret it as a short option. */
if (!long_only || argv[optind][1] == '-'
- || my_index (optstring, *nextchar) == NULL)
+ || strchr (optstring, *nextchar) == NULL)
{
if (print_errors)
{
@@ -877,7 +818,7 @@
{
char c = *nextchar++;
- char *temp = my_index (optstring, c);
+ char *temp = strchr (optstring, c);
/* Increment `optind' when we start to process its last character. */
if (*nextchar == '\0')
@@ -1187,10 +1128,7 @@
}
int
-getopt (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
+getopt (int argc, char *const *argv, const char *optstring)
{
return _getopt_internal (argc, argv, optstring,
(const struct option *) 0,
@@ -1206,9 +1144,7 @@
the above definition of `getopt'. */
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
int c;
int digit_optind = 0;
Index: shishi/gl/getopt.h
diff -u shishi/gl/getopt.h:1.1 shishi/gl/getopt.h:1.2
--- shishi/gl/getopt.h:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/getopt.h Sun Sep 14 17:10:11 2003
@@ -1,5 +1,8 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+ 1999, 2001, 2003 Free Software Foundation, Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -92,11 +95,7 @@
struct option
{
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
const char *name;
-# else
- char *name;
-# endif
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;
@@ -136,17 +135,16 @@
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
-#if (defined __STDC__ && __STDC__) || defined __cplusplus
-# ifdef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
+#else /* not __GNU_LIBRARY__ */
extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
+#endif /* __GNU_LIBRARY__ */
-# ifndef __need_getopt
+#ifndef __need_getopt
extern int getopt_long (int ___argc, char *const *___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind);
@@ -159,16 +157,7 @@
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
+#endif
#ifdef __cplusplus
}
Index: shishi/gl/getopt1.c
diff -u shishi/gl/getopt1.c:1.1 shishi/gl/getopt1.c:1.2
--- shishi/gl/getopt1.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/getopt1.c Sun Sep 14 17:10:11 2003
@@ -1,6 +1,8 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
- Free Software Foundation, Inc.
+
+ Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996,
+ 1997, 1998, 2003 Free Software Foundation, Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -27,14 +29,6 @@
# include "getopt.h"
#endif
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-#ifndef const
-#define const
-#endif
-#endif
-
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not
@@ -67,12 +61,11 @@
#endif
int
-getopt_long (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
+getopt_long (int argc,
+ char *const *argv,
+ const char *options,
+ const struct option *long_options,
+ int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
}
@@ -83,12 +76,11 @@
instead. */
int
-getopt_long_only (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
+getopt_long_only (int argc,
+ char *const *argv,
+ const char *options,
+ const struct option *long_options,
+ int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
}
@@ -105,9 +97,7 @@
#include <stdio.h>
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
int c;
int digit_optind = 0;
Index: shishi/gl/m4/Makefile.am
diff -u shishi/gl/m4/Makefile.am:1.6 shishi/gl/m4/Makefile.am:1.7
--- shishi/gl/m4/Makefile.am:1.6 Sat Sep 6 18:24:14 2003
+++ shishi/gl/m4/Makefile.am Sun Sep 14 17:10:11 2003
@@ -36,6 +36,7 @@
EXTRA_DIST += po.m4
EXTRA_DIST += progtest.m4
EXTRA_DIST += realloc.m4
+EXTRA_DIST += restrict.m4
EXTRA_DIST += setenv.m4
EXTRA_DIST += signed.m4
EXTRA_DIST += stdint_h.m4
@@ -47,6 +48,8 @@
EXTRA_DIST += strndup.m4
EXTRA_DIST += strnlen.m4
EXTRA_DIST += sysexits.m4
+EXTRA_DIST += timegm.m4
+EXTRA_DIST += time_r.m4
EXTRA_DIST += tm_gmtoff.m4
EXTRA_DIST += uintmax_t.m4
EXTRA_DIST += ulonglong.m4
@@ -57,6 +60,3 @@
EXTRA_DIST += wint_t.m4
EXTRA_DIST += xalloc.m4
EXTRA_DIST += xstrndup.m4
-EXTRA_DIST += restrict.m4
-EXTRA_DIST += timegm.m4
-EXTRA_DIST += time_r.m4
Index: shishi/gl/m4/error.m4
diff -u shishi/gl/m4/error.m4:1.2 shishi/gl/m4/error.m4:1.3
--- shishi/gl/m4/error.m4:1.2 Tue Sep 9 05:00:50 2003
+++ shishi/gl/m4/error.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
AC_DEFUN([gl_ERROR],
[
@@ -10,6 +10,6 @@
# Prerequisites of lib/error.c.
AC_DEFUN([jm_PREREQ_ERROR],
[
- AC_REQUIRE([AC_FUNC_VPRINTF])
- AC_FUNC_STRERROR_R
+ AC_REQUIRE([AC_FUNC_STRERROR_R])
+ :
])
Index: shishi/gl/m4/exitfail.m4
diff -u shishi/gl/m4/exitfail.m4:1.2 shishi/gl/m4/exitfail.m4:1.3
--- shishi/gl/m4/exitfail.m4:1.2 Tue Sep 9 05:00:50 2003
+++ shishi/gl/m4/exitfail.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-# exitfail.m4 serial 2
+# exitfail.m4 serial 3
dnl Copyright (C) 2002, 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
@@ -6,5 +6,8 @@
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
-dnl Prerequisites of lib/exitfail.c.
-AC_DEFUN([gl_EXITFAIL], [:])
+AC_DEFUN([gl_EXITFAIL],
+[
+ dnl No prerequisites of lib/exitfail.c.
+ :
+])
Index: shishi/gl/m4/extensions.m4
diff -u shishi/gl/m4/extensions.m4:1.1 shishi/gl/m4/extensions.m4:1.2
--- shishi/gl/m4/extensions.m4:1.1 Fri Aug 22 13:48:49 2003
+++ shishi/gl/m4/extensions.m4 Sun Sep 14 17:10:11 2003
@@ -3,7 +3,9 @@
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
+ AC_REQUIRE([AC_AIX])
AC_REQUIRE([AC_GNU_SOURCE])
+ AC_REQUIRE([AC_MINIX])
AH_VERBATIM([__EXTENSIONS__],
[/* Enable extensions on Solaris. */
#ifndef __EXTENSIONS__
Index: shishi/gl/m4/getopt.m4
diff -u shishi/gl/m4/getopt.m4:1.1 shishi/gl/m4/getopt.m4:1.2
--- shishi/gl/m4/getopt.m4:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/m4/getopt.m4 Sun Sep 14 17:10:11 2003
@@ -1,5 +1,5 @@
-# getopt.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# getopt.m4 serial 2
+dnl Copyright (C) 2002, 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
dnl Public License, this file may be distributed as part of a program
@@ -9,5 +9,5 @@
AC_DEFUN([gl_GETOPT],
[
dnl Prerequisites of lib/getopt.c.
- AC_CHECK_HEADERS_ONCE(string.h)
+ :
])
Index: shishi/gl/m4/mktime.m4
diff -u shishi/gl/m4/mktime.m4:1.2 shishi/gl/m4/mktime.m4:1.3
--- shishi/gl/m4/mktime.m4:1.2 Sat Sep 6 18:24:14 2003
+++ shishi/gl/m4/mktime.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-# mktime.m4 serial 3
+# mktime.m4 serial 4
dnl Copyright (C) 2002, 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
@@ -199,6 +199,4 @@
])
# Prerequisites of lib/mktime.c.
-AC_DEFUN([gl_PREREQ_MKTIME], [
- AC_REQUIRE([AC_HEADER_STDC])
-])
+AC_DEFUN([gl_PREREQ_MKTIME], [:])
Index: shishi/gl/m4/setenv.m4
diff -u shishi/gl/m4/setenv.m4:1.1 shishi/gl/m4/setenv.m4:1.2
--- shishi/gl/m4/setenv.m4:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/m4/setenv.m4 Sun Sep 14 17:10:11 2003
@@ -1,5 +1,5 @@
-# setenv.m4 serial 3
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# setenv.m4 serial 4
+dnl Copyright (C) 2001-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
dnl Public License, this file may be distributed as part of a program
@@ -40,7 +40,7 @@
AC_DEFUN([gl_PREREQ_SETENV],
[
AC_REQUIRE([AC_FUNC_ALLOCA])
- AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(unistd.h)
AC_CHECK_HEADERS(search.h)
AC_CHECK_FUNCS(tsearch)
gt_CHECK_VAR_DECL([#include <errno.h>], errno)
@@ -50,7 +50,7 @@
# Prerequisites of lib/unsetenv.c.
AC_DEFUN([gl_PREREQ_UNSETENV],
[
- AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(unistd.h)
gt_CHECK_VAR_DECL([#include <errno.h>], errno)
gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
])
Index: shishi/gl/m4/strchrnul.m4
diff -u shishi/gl/m4/strchrnul.m4:1.1 shishi/gl/m4/strchrnul.m4:1.2
--- shishi/gl/m4/strchrnul.m4:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/m4/strchrnul.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-# strchrnul.m4 serial 1
+# strchrnul.m4 serial 2
dnl Copyright (C) 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
@@ -18,6 +18,4 @@
])
# Prerequisites of lib/strchrnul.c.
-AC_DEFUN([gl_PREREQ_STRCHRNUL], [
- AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRCHRNUL], [:])
Index: shishi/gl/m4/strdup.m4
diff -u shishi/gl/m4/strdup.m4:1.1 shishi/gl/m4/strdup.m4:1.2
--- shishi/gl/m4/strdup.m4:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/m4/strdup.m4 Sun Sep 14 17:10:11 2003
@@ -1,5 +1,5 @@
-# strdup.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strdup.m4 serial 2
+dnl Copyright (C) 2002, 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
dnl Public License, this file may be distributed as part of a program
@@ -16,7 +16,6 @@
# Prerequisites of lib/strdup.c.
AC_DEFUN([gl_PREREQ_STRDUP], [
- AC_REQUIRE([AC_HEADER_STDC])
:
])
Index: shishi/gl/m4/strndup.m4
diff -u shishi/gl/m4/strndup.m4:1.1 shishi/gl/m4/strndup.m4:1.2
--- shishi/gl/m4/strndup.m4:1.1 Thu Jul 10 11:52:50 2003
+++ shishi/gl/m4/strndup.m4 Sun Sep 14 17:10:11 2003
@@ -1,5 +1,5 @@
-# strndup.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strndup.m4 serial 2
+dnl Copyright (C) 2002, 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
dnl Public License, this file may be distributed as part of a program
@@ -19,7 +19,6 @@
# Prerequisites of lib/strndup.c.
AC_DEFUN([gl_PREREQ_STRNDUP], [
- AC_REQUIRE([AC_HEADER_STDC])
AC_CHECK_DECLS(strnlen)
])
Index: shishi/gl/m4/strnlen.m4
diff -u shishi/gl/m4/strnlen.m4:1.1 shishi/gl/m4/strnlen.m4:1.2
--- shishi/gl/m4/strnlen.m4:1.1 Thu Jul 10 11:52:50 2003
+++ shishi/gl/m4/strnlen.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-# strnlen.m4 serial 2
+# strnlen.m4 serial 3
dnl Copyright (C) 2002-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
@@ -24,9 +24,4 @@
])
# Prerequisites of lib/strnlen.c.
-AC_DEFUN([gl_PREREQ_STRNLEN], [
- AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(memory.h string.h)
- AC_CHECK_DECLS(memchr)
-])
-
+AC_DEFUN([gl_PREREQ_STRNLEN], [:])
Index: shishi/gl/m4/xalloc.m4
diff -u shishi/gl/m4/xalloc.m4:1.2 shishi/gl/m4/xalloc.m4:1.3
--- shishi/gl/m4/xalloc.m4:1.2 Fri Aug 22 18:59:19 2003
+++ shishi/gl/m4/xalloc.m4 Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-# xalloc.m4 serial 2
+# xalloc.m4 serial 3
dnl Copyright (C) 2002-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
@@ -14,7 +14,6 @@
# Prerequisites of lib/xmalloc.c.
AC_DEFUN([gl_PREREQ_XMALLOC], [
- AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([jm_FUNC_MALLOC])
AC_REQUIRE([jm_FUNC_REALLOC])
])
Index: shishi/gl/malloc.c
diff -u shishi/gl/malloc.c:1.1 shishi/gl/malloc.c:1.2
--- shishi/gl/malloc.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/malloc.c Sun Sep 14 17:10:11 2003
@@ -22,14 +22,12 @@
#endif
#undef malloc
-#include <stddef.h>
-
-char *malloc ();
+#include <stdlib.h>
/* Allocate an N-byte block of memory from the heap.
If N is zero, allocate a 1-byte block. */
-char *
+void *
rpl_malloc (size_t n)
{
if (n == 0)
Index: shishi/gl/memmove.c
diff -u shishi/gl/memmove.c:1.1 shishi/gl/memmove.c:1.2
--- shishi/gl/memmove.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/memmove.c Sun Sep 14 17:10:11 2003
@@ -7,13 +7,13 @@
# include <config.h>
#endif
+#include <stddef.h>
+
void *
-memmove (dest, source, length)
- char *dest;
- const char *source;
- unsigned length;
+memmove (void *dest0, void const *source0, size_t length)
{
- char *d0 = dest;
+ char *dest = dest0;
+ char const *source = source0;
if (source < dest)
/* Moving from low mem to hi mem; start at end. */
for (source += length, dest += length; length; --length)
@@ -24,5 +24,5 @@
for (; length; --length)
*dest++ = *source++;
}
- return (void *) d0;
+ return dest0;
}
Index: shishi/gl/memset.c
diff -u shishi/gl/memset.c:1.1 shishi/gl/memset.c:1.2
--- shishi/gl/memset.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/memset.c Sun Sep 14 17:10:11 2003
@@ -1,5 +1,5 @@
/* memset.c -- set an area of memory to a given value
- Copyright (C) 1991 Free Software Foundation, Inc.
+ Copyright (C) 1991, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +15,10 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-char *
-memset (char *str, int c, unsigned int len)
+#include <stddef.h>
+
+void *
+memset (void *str, int c, size_t len)
{
register char *st = str;
Index: shishi/gl/mktime.c
diff -u shishi/gl/mktime.c:1.2 shishi/gl/mktime.c:1.3
--- shishi/gl/mktime.c:1.2 Sat Sep 6 18:24:14 2003
+++ shishi/gl/mktime.c Sun Sep 14 17:10:11 2003
@@ -25,10 +25,6 @@
# include <config.h>
#endif
-#ifdef _LIBC
-# define STDC_HEADERS 1
-#endif
-
/* Assume that leap seconds are possible, unless told otherwise.
If the host has a `zic' command with a `-L leapsecondfilename' option,
then it supports leap seconds; otherwise it probably doesn't. */
@@ -43,10 +39,8 @@
#if DEBUG
# include <stdio.h>
-# if STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-# endif
+# include <stdlib.h>
+# include <string.h>
/* Make it work even if the system's libc has its own mktime routine. */
# define mktime my_mktime
#endif /* DEBUG */
@@ -625,6 +619,6 @@
/*
Local Variables:
-compile-command: "gcc -DDEBUG -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime"
End:
*/
Index: shishi/gl/realloc.c
diff -u shishi/gl/realloc.c:1.2 shishi/gl/realloc.c:1.3
--- shishi/gl/realloc.c:1.2 Fri Aug 22 13:48:49 2003
+++ shishi/gl/realloc.c Sun Sep 14 17:10:11 2003
@@ -22,19 +22,14 @@
#endif
#undef realloc
-#include <stddef.h>
-
-char *malloc ();
-char *realloc ();
+#include <stdlib.h>
/* Change the size of an allocated block of memory P to N bytes,
with error checking. If N is zero, change it to 1. If P is NULL,
use malloc. */
-char *
-rpl_realloc (p, n)
- char *p;
- size_t n;
+void *
+rpl_realloc (void *p, size_t n)
{
if (n == 0)
n = 1;
Index: shishi/gl/setenv.c
diff -u shishi/gl/setenv.c:1.2 shishi/gl/setenv.c:1.3
--- shishi/gl/setenv.c:1.2 Fri Aug 22 13:48:49 2003
+++ shishi/gl/setenv.c Sun Sep 14 17:10:11 2003
@@ -28,12 +28,8 @@
# define __set_errno(ev) ((errno) = (ev))
#endif
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#if _LIBC || HAVE_UNISTD_H
# include <unistd.h>
#endif
@@ -284,7 +280,7 @@
never made it. Nevertheless the POSIX.9 standard (POSIX bindings
for Fortran 77) requires this function. */
int
-clearenv ()
+clearenv (void)
{
LOCK;
Index: shishi/gl/strchrnul.c
diff -u shishi/gl/strchrnul.c:1.1 shishi/gl/strchrnul.c:1.2
--- shishi/gl/strchrnul.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/strchrnul.c Sun Sep 14 17:10:11 2003
@@ -20,12 +20,11 @@
/* Find the first occurrence of C in S or the final NUL byte. */
char *
-strchrnul (s, c_in)
- const char *s;
- int c_in;
+strchrnul (const char *s, int c_in)
{
- while (*s && (*s != c_in))
+ char c = c_in;
+ while (*s && (*s != c))
s++;
- return (char*) s;
+ return (char *) s;
}
Index: shishi/gl/strdup.c
diff -u shishi/gl/strdup.c:1.1 shishi/gl/strdup.c:1.2
--- shishi/gl/strdup.c:1.1 Fri Jul 4 17:47:50 2003
+++ shishi/gl/strdup.c Sun Sep 14 17:10:11 2003
@@ -1,4 +1,6 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003 Free Software
+ Foundation, Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -16,16 +18,11 @@
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-char *memcpy ();
-#endif
+#include <stdlib.h>
+#include <string.h>
#undef __strdup
#undef strdup
Index: shishi/gl/strndup.c
diff -u shishi/gl/strndup.c:1.1 shishi/gl/strndup.c:1.2
--- shishi/gl/strndup.c:1.1 Thu Jul 10 11:52:50 2003
+++ shishi/gl/strndup.c Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
Library.
Bugs can be reported to address@hidden
@@ -21,15 +21,8 @@
# include "config.h"
#endif
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-#endif
+#include <stdlib.h>
+#include <string.h>
#ifndef HAVE_DECL_STRNLEN
"this configure-time declaration test was not run"
@@ -55,7 +48,7 @@
return NULL;
new[len] = '\0';
- return (char *) memcpy (new, s, len);
+ return memcpy (new, s, len);
}
#ifdef weak_alias
weak_alias (__strndup, strndup)
Index: shishi/gl/strnlen.c
diff -u shishi/gl/strnlen.c:1.1 shishi/gl/strnlen.c:1.2
--- shishi/gl/strnlen.c:1.1 Thu Jul 10 11:52:50 2003
+++ shishi/gl/strnlen.c Sun Sep 14 17:10:11 2003
@@ -21,21 +21,7 @@
#endif
#undef strnlen
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#ifndef HAVE_DECL_MEMCHR
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MEMCHR
-char *memchr ();
-#endif
+#include <string.h>
#undef __strnlen
#undef strnlen
Index: shishi/gl/unsetenv.c
diff -u shishi/gl/unsetenv.c:1.2 shishi/gl/unsetenv.c:1.3
--- shishi/gl/unsetenv.c:1.2 Fri Aug 22 13:48:49 2003
+++ shishi/gl/unsetenv.c Sun Sep 14 17:10:11 2003
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -27,12 +27,8 @@
# define __set_errno(ev) ((errno) = (ev))
#endif
-#if _LIBC || HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#if _LIBC || HAVE_UNISTD_H
# include <unistd.h>
#endif
Index: shishi/gl/vasnprintf.c
diff -u shishi/gl/vasnprintf.c:1.3 shishi/gl/vasnprintf.c:1.4
--- shishi/gl/vasnprintf.c:1.3 Fri Aug 22 18:59:19 2003
+++ shishi/gl/vasnprintf.c Sun Sep 14 17:10:11 2003
@@ -527,7 +527,7 @@
retcount = 0;
#if HAVE_SNPRINTF
-#define SNPRINTF_BUF(arg) \
+# define SNPRINTF_BUF(arg) \
switch (prefix_count) \
{ \
case 0: \
@@ -547,7 +547,7 @@
abort (); \
}
#else
-#define SNPRINTF_BUF(arg) \
+# define SNPRINTF_BUF(arg) \
switch (prefix_count) \
{ \
case 0: \
Index: shishi/gl/xmalloc.c
diff -u shishi/gl/xmalloc.c:1.2 shishi/gl/xmalloc.c:1.3
--- shishi/gl/xmalloc.c:1.2 Fri Aug 22 13:48:49 2003
+++ shishi/gl/xmalloc.c Sun Sep 14 17:10:11 2003
@@ -21,28 +21,17 @@
# include <config.h>
#endif
-#include <sys/types.h>
+#include "xalloc.h"
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-void *calloc ();
-void *malloc ();
-void *realloc ();
-void free ();
-#endif
+#include <stdlib.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include "error.h"
+#include "exit.h"
#include "exitfail.h"
-#include "xalloc.h"
-
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
/* The following tests require AC_PREREQ(2.54). */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- shishi ./configure.ac gl/Makefile.am gl/argp.h ...,
shishi-commit <=