GNU text utilities

diff --git a/lib/memchr.c b/lib/memchr.c
index 57f9973..5114869 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 7031ff2..d7bdd7c 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/regex.c b/lib/regex.c
index 5a6d3a1..5a98c6c 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -243,7 +243,7 @@ char *alloca ();
    destination)
 
 /* No need to do anything to free, after alloca.  */
-#define REGEX_FREE(arg) (0)
+#define REGEX_FREE(arg) ((void)0) /* Do nothing!  But inhibit gcc warning.  */
 
 #endif /* not REGEX_MALLOC */
 

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 3832252..591493e 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                                                               \
        {                                                               \