2008-04-25 Kai Tietz <kai.tietz@onevision.com>

[pf3gnuchains/gcc-fork.git] / fixincludes / fixincl.c

diff --git a/fixincludes/fixincl.c b/fixincludes/fixincl.c
index 7804df6..489f145 100644 (file)
--- a/fixincludes/fixincl.c
+++ b/fixincludes/fixincl.c
@@ -14,7 +14,7 @@ any later version.
 GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License for more de\atails.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
@@ -376,8 +376,13 @@ machine_matches( tFixDesc* p_fixd )
         }
     }
 
+  /* Check for sense inversion then set the "skip test" flag, if needed */
   if (p_fixd->fd_flags & FD_MACH_IFNOT)
-    return ! have_match;
+    have_match = ! have_match;
+
+  if (! have_match)
+    p_fixd->fd_flags |= FD_SKIP_TEST;
+
   return have_match;
 }
 
@@ -824,7 +829,7 @@ fix_with_system (tFixDesc* p_fixd,
       /*
        *  Now add the fix number and file names that may be needed
        */
-      sprintf (pz_scan, " %ld '%s' '%s' '%s'", p_fixd - fixDescList,
+      sprintf (pz_scan, " %ld '%s' '%s'",  (long) (p_fixd - fixDescList),
               pz_fix_file, pz_file_source, pz_temp_file);
     }
   else /* NOT an "internal" fix: */
@@ -1041,11 +1046,8 @@ fix_applies (tFixDesc* p_fixd)
 
   if (pz_scan != (char *) NULL)
     {
-      size_t name_len;
-
       while ((pz_fname[0] == '.') && (pz_fname[1] == '/'))
         pz_fname += 2;
-      name_len = strlen (pz_fname);
 
       for (;;)
         {