inclhack.def (limits_ifndefs): Add select test.

	* fixinc/inclhack.def (limits_ifndefs): Add select test.
	* fixinc/fixincl.x: Rebuild.

From-SVN: r69154

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e3af25b7d7a5cb4f94fcdba2ef7f4a3883d2d15..4a342f34452ffc72b52f65f5a360f61b8e2c0d35 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-09  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+       * fixinc/inclhack.def (limits_ifndefs): Add select test.
+       * fixinc/fixincl.x: Rebuild.
+
        * fixinc/inclhack.def (math_exception):  Improve bypass and comment.
        * fixinc/fixincl.x: Rebuild.
 

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 884f1e81fe5c922ff280c375c8b177d9fd8a7647..74f13bed9ffba8dd6e6ce0c371027877e80ee1db 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Wednesday July  9, 2003 at 04:58:23 PM EDT
+ * It has been AutoGen-ed  Wednesday July  9, 2003 at 05:06:05 PM EDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul  9 16:58:23 EDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul  9 17:06:05 EDT 2003
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -2829,15 +2829,22 @@ tSCC zLimits_IfndefsList[] =
  */
 #define apzLimits_IfndefsMachs (const char**)NULL
 
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zLimits_IfndefsSelect0[] =
+       "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
+
 /*
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zLimits_IfndefsBypass0[] =
        "ifndef[ \t]+FLT_(MIN|MAX)";
 
-#define    LIMITS_IFNDEFS_TEST_CT  1
+#define    LIMITS_IFNDEFS_TEST_CT  2
 static tTestDesc aLimits_IfndefsTests[] = {
-  { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL }, };
+  { TT_NEGREP,   zLimits_IfndefsBypass0, (regex_t*)NULL },
+  { TT_EGREP,    zLimits_IfndefsSelect0, (regex_t*)NULL }, };
 
 /*
  *  Fix Command Arguments for Limits_Ifndefs
@@ -2847,7 +2854,6 @@ static const char* apzLimits_IfndefsPatch[] = {
     "#ifndef %1\n\
 %0\n\
 #endif",
-    "^[ \t]*#[ \t]*define[ \t]+((FLT|DBL)_(MIN|MAX|DIG))[ \t].*",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -6100,7 +6106,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          171
+#define REGEX_COUNT          172
 #define MACH_LIST_SIZE_LIMIT 261
 #define FIX_COUNT            154
 

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index dda47b9b8d302643e6a785de95664ec74fde35dc..6fb057017e238e0e0b1512663e57292b1e0bfd1f 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -1609,12 +1609,13 @@ fix = {
     hackname = limits_ifndefs;
     files  = "sys/limits.h";
     files  = "limits.h";
+    select = "^[ \t]*#[ \t]*define[ \t]+"
+             "((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
     bypass = "ifndef[ \t]+FLT_(MIN|MAX)";
 
     c_fix     = format;
     c_fix_arg = "#ifndef %1\n%0\n#endif";
-    c_fix_arg = "^[ \t]*#[ \t]*define[ \t]+"
-                "((FLT|DBL)_(MIN|MAX|DIG))[ \t].*";
+    /* Second arg is select expression */
     test_text = " #\tdefine\tDBL_DIG \t 0  /* somthin' */";
 };