* etags.c (ISUPPER): Move to inside the only #ifdef where it's used.

This avoids an unused-macro warning with some GCC settings.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 928e8621c275ee97e94eea7129972605a07b47dd..cbaa5559f96e854c77c229297021101ce48e7dd2 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * etags.c (ISUPPER): Move to inside the only #ifdef where it's used.
+       This avoids an unused-macro warning with some GCC settings.
+
        * make-docfile.c (write_globals): Change char * to char const *
        to avoid a GCC "assignment discards qualifiers" diagnostic
        in some configurations.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index b738f0f4564f6b05678f391f9726dce86143c9cf..385e4cc9721268bbc42a3e2fc4b06bd5cfb0b1d6 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -236,7 +236,6 @@ If you want regular expression support, you should delete this notice and
 #define ISALNUM(c)     isalnum (CHAR(c))
 #define ISALPHA(c)     isalpha (CHAR(c))
 #define ISDIGIT(c)     isdigit (CHAR(c))
-#define ISUPPER(c)     isupper (CHAR(c))
 #define ISLOWER(c)     islower (CHAR(c))
 
 #define lowcase(c)     tolower (CHAR(c))
@@ -6648,6 +6647,7 @@ canonicalize_filename (register char *fn)
 
 #ifdef DOS_NT
   /* Canonicalize drive letter case.  */
+# define ISUPPER(c)    isupper (CHAR(c))
   if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0]))
     fn[0] = lowcase (fn[0]);