inclhack.def (hpux10_stdio_declarations, [...]): New hacks.

	* fixinc/inclhack.def (hpux10_stdio_declarations, ultrix_const3,
	ultrix_locale, ultrix_stdlib, ultrix_strings, ultrix_sys_time,
	ultrix_unistd): New hacks.
	* fixinc/tests/base/stdio.h (HPUX10_STDIO_DECLARATIONS_CHECK,
	ULTRIX_CONST2_CHECK): Add checks.
	* fixinc/tests/base/stdlib.h (ULTRIX_STDLIB_CHECK): Likewise.
	* fixinc/tests/base/strings.h (ULTRIX_STRINGS2_CHECK): Likewise.
	* fixinc/tests/base/unistd.h (ULTRIX_UNISTD_CHECK): Likewise.
	* fixinc/tests/base/sys/time.h (ULTRIX_SYS_TIME_CHECK): Likewise.
	* fixinc/tests/base/locale.h: New file.
	* fixinc/fixincl.x: Rebuilt.

From-SVN: r76298

6 files changed, 98 insertions, 0 deletions

diff --git a/gcc/fixinc/tests/base/locale.h b/gcc/fixinc/tests/base/locale.h
new file mode 100644
index 0000000..3b079e5
--- /dev/null
+++ b/gcc/fixinc/tests/base/locale.h
@@ -0,0 +1,20 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/locale.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+#ifndef FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE
+#define FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE 1
+
+
+
+#if defined( ULTRIX_LOCALE_CHECK )
+@(#)locale.h   6.1     (ULTRIX)
+
+#endif  /* ULTRIX_LOCALE_CHECK */
+
+#endif  /* FIXINC_WRAP_LOCALE_H_ULTRIX_LOCALE */
diff --git a/gcc/fixinc/tests/base/stdio.h b/gcc/fixinc/tests/base/stdio.h
index e4130e6..ea2c001 100644
--- a/gcc/fixinc/tests/base/stdio.h
+++ b/gcc/fixinc/tests/base/stdio.h
@@ -26,6 +26,12 @@ int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER
 #endif  /* BSD_STDIO_ATTRS_CONFLICT_CHECK */
 
 
+#if defined( HPUX10_STDIO_DECLARATIONS_CHECK )
+#  define _iob __iob
+
+#endif  /* HPUX10_STDIO_DECLARATIONS_CHECK */
+
+
 #if defined( HPUX11_SNPRINTF_CHECK )
 extern int snprintf(char *, size_t, const char *, ...);
 extern int snprintf(char *, _hpux_size_t, const char *, ...);
@@ -90,6 +96,12 @@ extern char *tempnam( const char *, const char *);
 #endif  /* ULTRIX_CONST2_CHECK */
 
 
+#if defined( ULTRIX_CONST3_CHECK )
+extern FILE *	fdopen( int __filedes, const char *__type );
+
+#endif  /* ULTRIX_CONST3_CHECK */
+
+
 #if defined( UNICOSMK_RESTRICT_CHECK )
 void f (char * __restrict__ x);
 #endif  /* UNICOSMK_RESTRICT_CHECK */
diff --git a/gcc/fixinc/tests/base/stdlib.h b/gcc/fixinc/tests/base/stdlib.h
index 7297a3a..0e1e59c 100644
--- a/gcc/fixinc/tests/base/stdlib.h
+++ b/gcc/fixinc/tests/base/stdlib.h
@@ -50,3 +50,17 @@ extern void *	bsearch(void*,size_t,size_t);
 int atexit( void (*__func)( void ) );
 
 #endif  /* ULTRIX_ATEXIT_PARAM_CHECK */
+
+
+#if defined( ULTRIX_STDLIB_CHECK )
+@(#)stdlib.h      6.1     (ULTRIX)
+char *		getenv( const char *__name );
+int		setenv( const char *__name, const char *__val, int __ovrwrt );
+void		unsetenv( const char *__name );
+int		putenv( char *__s );
+char	*getenv();
+int	setenv();
+void	unsetenv();
+int	putenv();
+
+#endif  /* ULTRIX_STDLIB_CHECK */
diff --git a/gcc/fixinc/tests/base/strings.h b/gcc/fixinc/tests/base/strings.h
index 36ca0b4..f17d3f8 100644
--- a/gcc/fixinc/tests/base/strings.h
+++ b/gcc/fixinc/tests/base/strings.h
@@ -22,4 +22,19 @@
 
 #endif  /* ULTRIX_STRINGS_CHECK */
 
+
+#if defined( ULTRIX_STRINGS2_CHECK )
+@(#)strings.h      6.1     (ULTRIX)
+	strncmp( const char *__s1, const char *__s2, size_t __n );
+
+extern int
+	strcasecmp( const char *__s1, const char *__s2),
+	strncasecmp( const char *__s1, const char *__s2, size_t __n );
+	strncmp();
+extern int
+	strcasecmp(),
+	strncasecmp();
+
+#endif  /* ULTRIX_STRINGS2_CHECK */
+
 #endif  /* FIXINC_WRAP_STRINGS_H_ULTRIX_STRINGS */
diff --git a/gcc/fixinc/tests/base/sys/time.h b/gcc/fixinc/tests/base/sys/time.h
index 931f424..f009f7e 100644
--- a/gcc/fixinc/tests/base/sys/time.h
+++ b/gcc/fixinc/tests/base/sys/time.h
@@ -12,3 +12,30 @@
 #if defined( HPUX_SYSTIME_CHECK )
 struct sigevent;
 #endif  /* HPUX_SYSTIME_CHECK */
+
+
+#if defined( ULTRIX_SYS_TIME_CHECK )
+@(#)time.h      6.1     (ULTRIX)
+extern time_t		time( time_t *__tloc );
+
+extern int adjtime(struct timeval *, struct timeval *);
+extern int getitimer(int, struct itimerval *);
+extern int setitimer(int, struct itimerval *, struct itimerval *);
+extern int gettimeofday(struct timeval *, struct timezone *);
+extern int settimeofday(struct timeval *, struct timezone *);
+extern void profil(const void *, size_t, size_t, unsigned int);
+extern int stime(const time_t *);
+extern int utimes(const char *, const struct timeval[2]);
+extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern double difftime();
+extern	int adjtime();
+extern	int getitimer();
+extern	int setitimer();
+extern	int gettimeofday();
+extern	int settimeofday();
+extern	void profil();
+extern	int stime();
+extern	int utimes();
+extern	int select();
+
+#endif  /* ULTRIX_SYS_TIME_CHECK */
diff --git a/gcc/fixinc/tests/base/unistd.h b/gcc/fixinc/tests/base/unistd.h
index 5bfb9b9..98e8c34 100644
--- a/gcc/fixinc/tests/base/unistd.h
+++ b/gcc/fixinc/tests/base/unistd.h
@@ -21,3 +21,13 @@ extern pid_t getpgid(pid_t);
 extern int getpagesize();
 extern int getpgid();
 #endif  /* SOLARIS_UNISTD_CHECK */
+
+
+#if defined( ULTRIX_UNISTD_CHECK )
+@(#)unistd.h      6.1     (ULTRIX)
+	getgroups(),
+	getpagesize(),
+	fork(),
+	vfork(),
+
+#endif  /* ULTRIX_UNISTD_CHECK */