diff options
| author | Jim Meyering <jim@meyering.net> | 1995-05-21 11:44:22 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1995-05-21 11:44:22 +0000 |
| commit | 7f9311c20e369a10a5583e9236e8daafc69758a0 (patch) | |
| tree | 9b2a355f8c6da07849caea201bdc46082f8bf5a6 | |
| parent | 37a6bc3abff0636164ba01a09994ba91c9b065df (diff) | |
| download | coreutils-7f9311c20e369a10a5583e9236e8daafc69758a0.tar.xz | |
merge with 1.11.1b
| -rw-r--r-- | lib/memchr.c | 8 | ||||
| -rw-r--r-- | lib/memmove.c | 4 | ||||
| -rw-r--r-- | lib/xstrtol.c | 8 | ||||
| -rw-r--r-- | old/textutils/ChangeLog | 11 | ||||
| -rw-r--r-- | src/join.c | 5 |
5 files changed, 25 insertions, 11 deletions
diff --git a/lib/memchr.c b/lib/memchr.c index 57f99735f..5114869ea 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -33,12 +33,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ # define __ptr_t char * #endif /* C++ or ANSI C. */ -#if defined (HAVE_STRING_H) || defined (_LIBC) -# include <string.h> -#endif - -#if defined (HAVE_LIMIT_H) || defined (_LIBC) -# include <limit.h> +#if defined (HAVE_LIMITS_H) || defined (_LIBC) +# include <limits.h> #endif #define LONG_MAX_32_BITS 2147483647 diff --git a/lib/memmove.c b/lib/memmove.c index 7031ff24c..d7bdd7cd9 100644 --- a/lib/memmove.c +++ b/lib/memmove.c @@ -3,6 +3,10 @@ In the public domain. By David MacKenzie <djm@gnu.ai.mit.edu>. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + void memmove (dest, source, length) char *dest; diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 383225233..591493e50 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -2,10 +2,12 @@ #include <config.h> #endif +#include "xstrtol.h" /* Get definition for __P before use. */ + #ifdef STDC_HEADERS #include <stdlib.h> #else -long int __strtol (const char *, char **, int base); +__unsigned long int __strtol __P ((const char *, char **, int base)); #endif #ifdef HAVE_STRING_H @@ -17,8 +19,8 @@ long int __strtol (const char *, char **, int base); # endif #endif +#define NDEBUG #include <assert.h> -/* FIXME: define NDEBUG before release. */ #include <errno.h> #ifndef errno @@ -37,8 +39,6 @@ extern int errno; #define LONG_MAX ((long int) (ULONG_MAX >> 1)) #endif -#include "xstrtol.h" - #define BKM_SCALE(x, scale_factor, error_return) \ do \ { \ diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index b297c32d5..a01f565a5 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -1,5 +1,16 @@ Sat May 20 06:44:14 1995 Jim Meyering (meyering@comco.com) + * join.c (ADD_FIELD): Declare in K&R style, not ANSI. + From Kaveh Ghazi. + + * xstrtol.c: Define NDEBUG for systems with losing assert.h. + (__strtol): Add __unsigned to prototype and use __P. + Move inclusion of xstrtol.h to precede prototype. + From Kaveh Ghazi. + + * memmove.c: Include config.h for definition of const. + From Kaveh Ghazi. + * All Makefile.in (install-exec, install-exec): New targets. From Karl Berry. diff --git a/src/join.c b/src/join.c index 3d0320ae4..88369dd9e 100644 --- a/src/join.c +++ b/src/join.c @@ -113,7 +113,10 @@ static struct line blank1; static struct line blank2; static void -ADD_FIELD (struct line *line, const char *field, size_t len) +ADD_FIELD (line, field, len) + struct line *line; + const char *field; + size_t len; { if (line->nfields >= line->nfields_allocated) { |