From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2011 23:26:55 +0000 (-0800)
Subject: * etags.c (ISUPPER): Move to inside the only #ifdef where it's used.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~726^2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f5e6230d78d28cd4acba7a7eaa2292477f4e0ff;p=emacs.git

* 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 928e8621c27..cbaa5559f96 100644
--- 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 b738f0f4564..385e4cc9721 100644
--- 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]);