Don't include <ctype.h> or define IS* macros since system.h now does that.

diff --git a/src/expr.c b/src/expr.c
index 719402fff6de18a6ce8389a23f3335abcbc2451a..d4c7eb52f7b56fde23da8aee94b2d30e99c3dc8a 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -40,7 +40,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <regex.h>
 
@@ -48,14 +47,6 @@
 #include "version.h"
 #include "long-options.h"
 
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-#define ISASCII(c) 1
-#else
-#define ISASCII(c) isascii(c)
-#endif
-
-#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
-
 #define NEW(type) ((type *) xmalloc (sizeof (type)))
 #define OLD(x) free ((char *) x)
 

diff --git a/src/printf.c b/src/printf.c
index 87a8000bc2458e737bd77c5db80241713de66f16..2719053c181968751d81c804ae23818002226e3a 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -55,7 +55,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <getopt.h>
 
@@ -63,15 +62,6 @@
 #include "version.h"
 #include "long-options.h"
 
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-#define ISASCII(c) 1
-#else
-#define ISASCII(c) isascii(c)
-#endif
-
-#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
-#define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
-
 #ifndef STDC_HEADERS
 double strtod ();
 long strtol ();
@@ -192,7 +182,7 @@ print_formatted (format, argc, argv)
   int save_argc = argc;                /* Preserve original value.  */
   char *f;                     /* Pointer into `format'.  */
   char *direc_start;           /* Start of % directive.  */
-  int direc_length;            /* Length of % directive.  */
+  size_t direc_length;         /* Length of % directive.  */
   int field_width;             /* Arg to first '*', or -1 if none.  */
   int precision;               /* Arg to second '*', or -1 if none.  */
 
@@ -396,7 +386,7 @@ print_esc_string (str)
 static void
 print_direc (start, length, field_width, precision, argument)
      char *start;
-     int length;
+     size_t length;
      int field_width;
      int precision;
      char *argument;