Fix autoconf breakage + commit target.c, omitted in previous delta

[deliverable/binutils-gdb.git] / libiberty / argv.c

diff --git a/libiberty/argv.c b/libiberty/argv.c
index f596ffd0110a033ed095cc989cdf9b900c1500b0..35882854588fe1a141b3646f4db4c124c0a8a143 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -25,10 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "ansidecl.h"
 #include "libiberty.h"
 
-#ifdef isspace
-#undef isspace
-#endif
-#define isspace(ch) ((ch) == ' ' || (ch) == '\t')
+#define ISBLANK(ch) ((ch) == ' ' || (ch) == '\t')
 
 /*  Routines imported from standard C runtime libraries. */
 
@@ -51,7 +48,6 @@ extern char *strdup ();               /* Duplicate a string */
 
 #endif /* __STDC__ */
 
-#include "alloca-conf.h"
 
 #ifndef NULL
 #define NULL 0
@@ -227,7 +223,7 @@ char *input;
       do
        {
          /* Pick off argv[argc] */
-         while (isspace (*input))
+         while (ISBLANK (*input))
            {
              input++;
            }
@@ -260,7 +256,7 @@ char *input;
          arg = copybuf;
          while (*input != EOS)
            {
-             if (isspace (*input) && !squote && !dquote && !bsquote)
+             if (ISBLANK (*input) && !squote && !dquote && !bsquote)
                {
                  break;
                }
@@ -326,7 +322,7 @@ char *input;
          argc++;
          argv[argc] = NULL;
 
-         while (isspace (*input))
+         while (ISBLANK (*input))
            {
              input++;
            }