2012-03-12 Tristan Gingold <gingold@adacore.com>

	* inclhack.def (vms_use_quoted_include,vms_add_missing_braces)
	(vms_do_not_redeclare_hostalias, vms_decc_builtin)
	(vms_no_64bit_getopt, vms_forward_declare_struct)
	(vms_use_fast_setjmp): New fixes.
	* fixincl.x: Regenerate.
	* tests/base/rtldef/string.h: Update.
	* tests/base/rtldef/if.h, tests/base/rtldef/resolv.h,
	* tests/base/rtldef/setjmp.h, tests/base/rtldef/signal.h,
	* tests/base/rtldef/stdio.h, tests/base/rtldef/wait.h: New files.

From-SVN: r185230

7 files changed, 100 insertions, 0 deletions

diff --git a/fixincludes/tests/base/rtldef/if.h b/fixincludes/tests/base/rtldef/if.h
new file mode 100644
index 0000000..836ff27
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/if.h
@@ -0,0 +1,18 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/if.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_FORWARD_DECLARE_STRUCT_CHECK )
+/* forward decls for C++ */
+#if defined (__cplusplus) || defined (__GNUC__)
+struct foo;
+#endif
+
+#endif  /* VMS_FORWARD_DECLARE_STRUCT_CHECK */
diff --git a/fixincludes/tests/base/rtldef/resolv.h b/fixincludes/tests/base/rtldef/resolv.h
new file mode 100644
index 0000000..0b5b248
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/resolv.h
@@ -0,0 +1,16 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/resolv.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_DO_NOT_REDECLARE_HOSTALIAS_CHECK )
+void		fp_nquery (const u_char *, int, FILE *);
+/* __char_ptr32	hostalias (const char *); */
+
+#endif  /* VMS_DO_NOT_REDECLARE_HOSTALIAS_CHECK */
diff --git a/fixincludes/tests/base/rtldef/setjmp.h b/fixincludes/tests/base/rtldef/setjmp.h
new file mode 100644
index 0000000..5414efc
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/setjmp.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/setjmp.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_USE_FAST_SETJMP_CHECK )
+#   if defined(__FAST_SETJMP) || defined (__GNUC__) || defined(__UNIX_SETJMP)
+#endif  /* VMS_USE_FAST_SETJMP_CHECK */
diff --git a/fixincludes/tests/base/rtldef/signal.h b/fixincludes/tests/base/rtldef/signal.h
new file mode 100644
index 0000000..3b5a2b8
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/signal.h
@@ -0,0 +1,16 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/signal.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_ADD_MISSING_BRACES_CHECK )
+static const __sigset_t _SIG_EMPTY_SET  = { {0x00000000, 0x00000000} },
+ _SIG_FULL_SET   = { {0xFFFFFFFF, 0xFFFFFFFF} };
+
+#endif  /* VMS_ADD_MISSING_BRACES_CHECK */
diff --git a/fixincludes/tests/base/rtldef/stdio.h b/fixincludes/tests/base/rtldef/stdio.h
new file mode 100644
index 0000000..4835d0f
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/stdio.h
@@ -0,0 +1,16 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/stdio.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_NO_64BIT_GETOPT_CHECK )
+#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only.  */
+int getopt (int, char * const [], const char *);
+#endif
+#endif  /* VMS_NO_64BIT_GETOPT_CHECK */
diff --git a/fixincludes/tests/base/rtldef/string.h b/fixincludes/tests/base/rtldef/string.h
index 1ac9b2a..6249b0c 100644
--- a/fixincludes/tests/base/rtldef/string.h
+++ b/fixincludes/tests/base/rtldef/string.h
@@ -13,3 +13,9 @@
 #if !defined(__VAX) && !defined(__GNUC__)
 
 #endif  /* VMS_DISABLE_DECC_STRING_BUILTINS_CHECK */
+
+
+#if defined( VMS_DECC_BUILTIN_CHECK )
+define FD_ZERO(__p) memset((__p), 0, sizeof(*(__p)))
+
+#endif  /* VMS_DECC_BUILTIN_CHECK */
diff --git a/fixincludes/tests/base/rtldef/wait.h b/fixincludes/tests/base/rtldef/wait.h
new file mode 100644
index 0000000..0587834
--- /dev/null
+++ b/fixincludes/tests/base/rtldef/wait.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/rtldef/wait.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( VMS_USE_QUOTED_INCLUDE_CHECK )
+#   include <sys/resource.h>
+#endif  /* VMS_USE_QUOTED_INCLUDE_CHECK */