diff options
Diffstat (limited to 'gcc/fixinc/tests/base')
| -rw-r--r-- | gcc/fixinc/tests/base/Xm/Traversal.h | 2 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/assert.h | 12 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/ctype.h | 65 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/internal/sgimacros.h | 17 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/internal/wchar_core.h | 15 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/math.h | 12 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/pthread.h | 20 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/stdio.h | 6 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/stdlib.h | 6 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/strings.h | 6 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/sys/mman.h | 6 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/sys/socket.h | 19 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/sys/stat.h | 9 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/time.h | 6 |
14 files changed, 172 insertions, 29 deletions
diff --git a/gcc/fixinc/tests/base/Xm/Traversal.h b/gcc/fixinc/tests/base/Xm/Traversal.h index 6ca893e3c3a..61e6df1164e 100644 --- a/gcc/fixinc/tests/base/Xm/Traversal.h +++ b/gcc/fixinc/tests/base/Xm/Traversal.h @@ -14,7 +14,7 @@ struct wedge { #ifdef __cplusplus Widget old, c_new; #else - Widget old, new; /* fix the new */ + Widget old, new; /* fixinc check FAILS ON BSD */ #endif }; extern Wedged( Widget c_new, Widget old ); diff --git a/gcc/fixinc/tests/base/assert.h b/gcc/fixinc/tests/base/assert.h index 5140e892e3c..2642cbe49c4 100644 --- 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/ctype.h b/gcc/fixinc/tests/base/ctype.h new file mode 100644 index 00000000000..deabd5e4473 --- /dev/null +++ b/gcc/fixinc/tests/base/ctype.h @@ -0,0 +1,65 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/ctype.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( HPUX10_CTYPE_DECLARATIONS1_CHECK ) +#ifdef _PROTOTYPES +extern int __tolower(int); +extern int __toupper(int); +#else /* NOT _PROTOTYPES */ +extern int __tolower(); +extern int __toupper(); +#endif /* _PROTOTYPES */ + +# define _toupper(__c) __toupper(__c) + + +#endif /* HPUX10_CTYPE_DECLARATIONS1_CHECK */ + + +#if defined( HPUX10_CTYPE_DECLARATIONS2_CHECK ) +# if defined(_SB_CTYPE_MACROS) && !defined(__lint) + +#ifdef _PROTOTYPES + extern int _isalnum(int); + extern int _isalpha(int); + extern int _iscntrl(int); + extern int _isdigit(int); + extern int _isgraph(int); + extern int _islower(int); + extern int _isprint(int); + extern int _ispunct(int); + extern int _isspace(int); + extern int _isupper(int); + extern int _isxdigit(int); +# else /* not _PROTOTYPES */ + extern int _isalnum(); + extern int _isalpha(); + extern int _iscntrl(); + extern int _isdigit(); + extern int _isgraph(); + extern int _islower(); + extern int _isprint(); + extern int _ispunct(); + extern int _isspace(); + extern int _isupper(); + extern int _isxdigit(); +#endif /* _PROTOTYPES */ + + extern unsigned int *__SB_masks; + +#endif /* HPUX10_CTYPE_DECLARATIONS2_CHECK */ + + +#if defined( HPUX_CTYPE_MACROS_CHECK ) +: __SB_masks ? (int)__SB_masks[__alnum] & _ISCNTRL +# define isalpha(__c) (__SB_masks ? (int)__SB_masks[__c] & _IS + +#endif /* HPUX_CTYPE_MACROS_CHECK */ diff --git a/gcc/fixinc/tests/base/internal/sgimacros.h b/gcc/fixinc/tests/base/internal/sgimacros.h new file mode 100644 index 00000000000..a491e865af7 --- /dev/null +++ b/gcc/fixinc/tests/base/internal/sgimacros.h @@ -0,0 +1,17 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/internal/sgimacros.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( IRIX___RESTRICT_CHECK ) +#ifdef __c99 +# ifndef __cplusplus +# define __restrict restrict +# endif +#endif /* IRIX___RESTRICT_CHECK */ diff --git a/gcc/fixinc/tests/base/internal/wchar_core.h b/gcc/fixinc/tests/base/internal/wchar_core.h new file mode 100644 index 00000000000..5b358a32213 --- /dev/null +++ b/gcc/fixinc/tests/base/internal/wchar_core.h @@ -0,0 +1,15 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/internal/wchar_core.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( IRIX_WCSFTIME_CHECK ) +#if _NO_XOPEN5 && !defined(__c99) +extern size_t wcsftime(wchar_t *, __SGI_LIBC_NAMESPACE_QUALIFIER size_t, const char *, const struct tm *); +#endif /* IRIX_WCSFTIME_CHECK */ diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h index 4d9907c3910..22d52d1b72c 100644 --- 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 @@ -144,6 +144,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/pthread.h b/gcc/fixinc/tests/base/pthread.h index 0b2afc7867f..ec7ff351f45 100644 --- a/gcc/fixinc/tests/base/pthread.h +++ b/gcc/fixinc/tests/base/pthread.h @@ -20,7 +20,23 @@ extern int __page_size; #endif /* PTHREAD_PAGE_SIZE_CHECK */ -#if defined( SOLARIS_MUTEX_INIT_CHECK ) +#if defined( SOLARIS_MUTEX_INIT_1_CHECK ) +#ident "@(#)pthread.h 1.16 97/05/05 SMI" +#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) +#define PTHREAD_MUTEX_INITIALIZER {{{0}, 0}, {{{0}}}, 0} +#else +#define PTHREAD_MUTEX_INITIALIZER {{{0}, 0}, {{{0}}}, {0}} +#endif +#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) +#define PTHREAD_COND_INITIALIZER {{{0},0}, 0} /* */ +#else +#define PTHREAD_COND_INITIALIZER {{{0},0}, {0}} /* */ +#endif + +#endif /* SOLARIS_MUTEX_INIT_1_CHECK */ + + +#if defined( SOLARIS_MUTEX_INIT_2_CHECK ) #ident "@(#)pthread.h 1.26 98/04/12 SMI" #if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG) #define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0} @@ -33,7 +49,7 @@ extern int __page_size; #define PTHREAD_COND_INITIALIZER {{{0}, 0}, {0}} /* DEFAULTCV */ #endif #define PTHREAD_RWLOCK_INITIALIZER {0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}} -#endif /* SOLARIS_MUTEX_INIT_CHECK */ +#endif /* SOLARIS_MUTEX_INIT_2_CHECK */ #if defined( THREAD_KEYWORD_CHECK ) diff --git a/gcc/fixinc/tests/base/stdio.h b/gcc/fixinc/tests/base/stdio.h index 00d3c836ff4..bfa929fb666 100644 --- 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/stdlib.h b/gcc/fixinc/tests/base/stdlib.h index 857989cb9cb..441e1ae06ab 100644 --- a/gcc/fixinc/tests/base/stdlib.h +++ b/gcc/fixinc/tests/base/stdlib.h @@ -21,6 +21,12 @@ #endif /* HPUX11_ABS_CHECK */ +#if defined( HPUX_LONG_DOUBLE_CHECK ) +extern long double strtold(const char *, char **); + +#endif /* HPUX_LONG_DOUBLE_CHECK */ + + #if defined( INT_ABORT_FREE_AND_EXIT_CHECK ) extern void abort(int); extern void free(void*); diff --git a/gcc/fixinc/tests/base/strings.h b/gcc/fixinc/tests/base/strings.h index 23f0d00e1ab..36ca0b4c0f1 100644 --- 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 90b10f43b29..8fa2fb18c2a 100644 --- 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/sys/socket.h b/gcc/fixinc/tests/base/sys/socket.h new file mode 100644 index 00000000000..56099a92002 --- /dev/null +++ b/gcc/fixinc/tests/base/sys/socket.h @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/sys/socket.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( IRIX_SOCKLEN_T_CHECK ) +#define _SOCKLEN_T +#if _NO_XOPEN4 && _NO_XOPEN5 +typedef int socklen_t; +#else +typedef u_int32_t socklen_t; +#endif /* _NO_XOPEN4 && _NO_XOPEN5 */ +#endif /* IRIX_SOCKLEN_T_CHECK */ diff --git a/gcc/fixinc/tests/base/sys/stat.h b/gcc/fixinc/tests/base/sys/stat.h index 46a4623cd27..9646f8c4bae 100644 --- a/gcc/fixinc/tests/base/sys/stat.h +++ b/gcc/fixinc/tests/base/sys/stat.h @@ -9,6 +9,11 @@ +#if defined( ALPHA___EXTERN_PREFIX_CHECK ) +# if defined(__DECC) || defined(__PRAGMA_EXTERN_PREFIX) +#endif /* ALPHA___EXTERN_PREFIX_CHECK */ + + #if defined( M88K_BAD_S_IF_CHECK ) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) /* is regular? */ #endif /* M88K_BAD_S_IF_CHECK */ @@ -31,7 +36,7 @@ static int stat(const char *__f, struct stat *__p) { } #endif /* __cplusplus */ -# else /* !__STDC__ */ +# else /* !__STDC__ THIS FAILS ON BSD SYSTEMS */ #if __cplusplus extern "C" { #endif /* __cplusplus */ @@ -57,7 +62,7 @@ static int stat(__f, __p) fstat(), lstat(), - +/* THE INSERTION LINE FAILS ON BSD SYSTEMS */ #endif /* ULTRIX_STAT_CHECK */ diff --git a/gcc/fixinc/tests/base/time.h b/gcc/fixinc/tests/base/time.h index 100992442b7..fb6e27dc163 100644 --- 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 */ |