wrapper guard must be a function of *both* the file name and the fix name

From-SVN: r61781

diff --git a/gcc/fixinc/tests/base/assert.h b/gcc/fixinc/tests/base/assert.h
index 5140e892e3c779fbc62c63cbf7a22684ae493cd7..2642cbe49c4bf1fe969adb46a2f9f9752f48254a 100644 (file)
--- a/gcc/fixinc/tests/base/assert.h
+++ b/gcc/fixinc/tests/base/assert.h
@@ -7,14 +7,14 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_BROKEN_ASSERT_STDLIB_CHECK
-#define FIXINC_BROKEN_ASSERT_STDLIB_CHECK 1
+#ifndef FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDLIB
+#define FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDLIB 1
 
 #ifdef __cplusplus
 #include <stdlib.h>
 #endif
-#ifndef FIXINC_BROKEN_ASSERT_STDIO_CHECK
-#define FIXINC_BROKEN_ASSERT_STDIO_CHECK 1
+#ifndef FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDIO
+#define FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDIO 1
 
 #include <stdio.h>
 
@@ -38,6 +38,6 @@ extern FILE* stderr;
 extern void exit ( int );
 #endif  /* BROKEN_ASSERT_STDLIB_CHECK */
 
-#endif  /* FIXINC_BROKEN_ASSERT_STDIO_CHECK */
+#endif  /* FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDIO */
 
-#endif  /* FIXINC_BROKEN_ASSERT_STDLIB_CHECK */
+#endif  /* FIXINC_WRAP_ASSERT_H_BROKEN_ASSERT_STDLIB */

diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h
index 8cd8c224da422ba464cb48219e65c19f125e5825..e3c80991e64a9a55cccf65103528937fdd762bf6 100644 (file)
--- a/gcc/fixinc/tests/base/math.h
+++ b/gcc/fixinc/tests/base/math.h
@@ -7,12 +7,12 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_SUNOS_MATHERR_DECL_CHECK
-#define FIXINC_SUNOS_MATHERR_DECL_CHECK 1
+#ifndef FIXINC_WRAP_MATH_H_SUNOS_MATHERR_DECL
+#define FIXINC_WRAP_MATH_H_SUNOS_MATHERR_DECL 1
 
 struct exception;
-#ifndef FIXINC_MATH_EXCEPTION_CHECK
-#define FIXINC_MATH_EXCEPTION_CHECK 1
+#ifndef FIXINC_WRAP_MATH_H_MATH_EXCEPTION
+#define FIXINC_WRAP_MATH_H_MATH_EXCEPTION 1
 
 #ifdef __cplusplus
 #define exception __math_exception
@@ -134,6 +134,6 @@ extern double atof(const char *__nptr);
 #undef exception
 #endif
 
-#endif  /* FIXINC_MATH_EXCEPTION_CHECK */
+#endif  /* FIXINC_WRAP_MATH_H_MATH_EXCEPTION */
 
-#endif  /* FIXINC_SUNOS_MATHERR_DECL_CHECK */
+#endif  /* FIXINC_WRAP_MATH_H_SUNOS_MATHERR_DECL */

diff --git a/gcc/fixinc/tests/base/stdio.h b/gcc/fixinc/tests/base/stdio.h
index 00d3c836ff4ffeab30eb3950568ed70d59d7a4b4..bfa929fb6663dd6bbdc671f853c36dcb34aaf4b8 100644 (file)
--- a/gcc/fixinc/tests/base/stdio.h
+++ b/gcc/fixinc/tests/base/stdio.h
@@ -7,8 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_STDIO_STDARG_H_CHECK
-#define FIXINC_STDIO_STDARG_H_CHECK 1
+#ifndef FIXINC_WRAP_STDIO_H_STDIO_STDARG_H
+#define FIXINC_WRAP_STDIO_H_STDIO_STDARG_H 1
 
 #define __need___va_list
 #include <stdarg.h>
@@ -80,4 +80,4 @@ extern char *tempnam( const char *, const char *);
 void f (char * __restrict__ x);
 #endif  /* UNICOSMK_RESTRICT_CHECK */
 
-#endif  /* FIXINC_STDIO_STDARG_H_CHECK */
+#endif  /* FIXINC_WRAP_STDIO_H_STDIO_STDARG_H */

diff --git a/gcc/fixinc/tests/base/strings.h b/gcc/fixinc/tests/base/strings.h
index 23f0d00e1ab9017c62c88d558a16ba6adb3d71bf..36ca0b4c0f1729548c171a6b381e28fb6210684f 100644 (file)
--- a/gcc/fixinc/tests/base/strings.h
+++ b/gcc/fixinc/tests/base/strings.h
@@ -7,8 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_ULTRIX_STRINGS_CHECK
-#define FIXINC_ULTRIX_STRINGS_CHECK 1
+#ifndef FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS
+#define FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS 1
 
 
 
@@ -22,4 +22,4 @@
 
 #endif  /* ULTRIX_STRINGS_CHECK */
 
-#endif  /* FIXINC_ULTRIX_STRINGS_CHECK */
+#endif  /* FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS */

diff --git a/gcc/fixinc/tests/base/sys/mman.h b/gcc/fixinc/tests/base/sys/mman.h
index 90b10f43b29bdb1ec856a2d3947fd688e65da57c..8fa2fb18c2a5f0dcf65d8edad376e9eb2cbef3be 100644 (file)
--- a/gcc/fixinc/tests/base/sys/mman.h
+++ b/gcc/fixinc/tests/base/sys/mman.h
@@ -7,8 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_CXX_UNREADY_CHECK
-#define FIXINC_CXX_UNREADY_CHECK 1
+#ifndef FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY
+#define FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,4 +22,4 @@ extern void* malloc( size_t );
 }
 #endif
 
-#endif  /* FIXINC_CXX_UNREADY_CHECK */
+#endif  /* FIXINC_WRAP_SYS_MMAN_H_CXX_UNREADY */

diff --git a/gcc/fixinc/tests/base/time.h b/gcc/fixinc/tests/base/time.h
index 100992442b78aeef811c2fb14c31ff85d933b995..fb6e27dc1633d97f8fc9dcb1f193afa57ca68460 100644 (file)
--- a/gcc/fixinc/tests/base/time.h
+++ b/gcc/fixinc/tests/base/time.h
@@ -7,8 +7,8 @@
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
 
-#ifndef FIXINC_M88K_MULTI_INCL_CHECK
-#define FIXINC_M88K_MULTI_INCL_CHECK 1
+#ifndef FIXINC_WRAP_TIME_H_M88K_MULTI_INCL
+#define FIXINC_WRAP_TIME_H_M88K_MULTI_INCL 1
 
 
 
@@ -34,4 +34,4 @@ typedef void (*__gcc_VOIDFUNCPTR) ();
 #define VOIDFUNCPTR __gcc_VOIDFUNCPTR
 #endif  /* VXWORKS_TIME_CHECK */
 
-#endif  /* FIXINC_M88K_MULTI_INCL_CHECK */
+#endif  /* FIXINC_WRAP_TIME_H_M88K_MULTI_INCL */