merge with 1.11.1b

diff --git a/lib/memchr.c b/lib/memchr.c
index 57f99735f337ae9c412d77b6d838c1ba3b934dd2..5114869ea536c477902a84f5b54935b09da55ab1 100644 (file)
--- 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 7031ff24cf131fa477b4524cbc21a58c4530f35d..d7bdd7cd99503b51ebe37eb7d45d778a8954e8d3 100644 (file)
--- 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 383225233e9c57d2336d230ca2eb22f31027563b..591493e50c78cc4b6bd07b48754df86f88e5012f 100644 (file)
--- 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 b297c32d5e9a6fc48dc18625b1d7861f96d3fdb0..a01f565a512c252690fcbae824b58a582c47eb3f 100644 (file)
--- 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 3d0320ae4035b21452d9519cf592002bb2483617..88369dd9e77b48f1a97ab8b751d6af626c713bc9 100644 (file)
--- 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)
     {