gcc/gcc/fixinc/inclhack.def

2663 lines
70 KiB
Modula-2
Raw Normal View History

/* -*- Mode: C -*- */
autogen definitions inclhack;
/*
Define all the fixes we know about for repairing damaged headers.
Please see the README before adding or changing entries in this file.
Set up a debug test so we can make the templates emit special
code while debugging these fixes: */
#ifdef DEBUG
FIXINC_DEBUG = yes;
#endif
/* DO NOT DO BROKEN FIXES (empty replacement fixes) */
/*
* Purge some HP-UX 11 files that are only broken after they are "fixed".
*/
fix = {
hackname = AAA_ki_iface;
files = sys/ki_iface.h;
select = 'These definitions are for HP Internal developers';
replace; /* empty replacement -> no fixing the file */
};
/*
* Purge some HP-UX 11 files that are only broken after they are "fixed".
*/
fix = {
hackname = AAA_ki;
files = sys/ki.h;
select = '11.00 HP-UX LP64';
replace; /* empty replacement -> no fixing the file */
};
/*
* Purge some HP-UX 11 files that are only broken after they are "fixed".
*/
fix = {
hackname = AAA_ki_calls;
files = sys/ki_calls.h;
select = 'kthread_create_caller_t';
replace; /* empty replacement -> no fixing the file */
};
/*
* Purge some HP-UX 11 files that are only broken after they are "fixed".
*/
fix = {
hackname = AAA_ki_defs;
files = sys/ki_defs.h;
select = 'Kernel Instrumentation Definitions';
replace; /* empty replacement -> no fixing the file */
};
/*
* This file on SunOS 4 has a very large macro. When the sed loop
* tries pull it in, it overflows the pattern space size of the SunOS
* sed (GNU sed does not have this problem). Since the file does not
* require fixing, we remove it from the fixed directory.
*/
fix = {
hackname = AAA_bad_fixes;
files = sundev/ipi_error.h;
/* shouldn't there be a select expression here??? */
replace; /* empty replacement -> no fixing the file */
};
/*
* Purge some HP-UX 11 files that are only broken after they are "fixed".
*/
fix = {
hackname = AAA_time;
files = sys/time.h;
select = '11.0 and later representation of ki time';
replace; /* empty replacement -> no fixing the file */
};
/* And now, the real fixes, replacement text fixes first: */
/*
* Completely replace <_int_varargs.h> with a file that includes gcc's
* stdarg.h or varargs.h files as appropriate on DG/UX
*/
fix = {
hackname = AAB_dgux_int_varargs;
files = _int_varargs.h;
replace = "#ifndef __INT_VARARGS_H
\#define __INT_VARARGS_H
/************************************************************************/
/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */
/************************************************************************/
/*
** This file is a DG internal header. Never include this
** file directly.
*/
\#ifndef ___int_features_h
\#include <sys/_int_features.h>
\#endif
\#if !(defined(_VA_LIST) || defined(_VA_LIST_))
\#define _VA_LIST
\#define _VA_LIST_
\#ifdef __LINT__
\#ifdef __STDC__
typedef void * va_list;
\#else
typedef char * va_list;
\#endif
\#else
\#if _M88K_ANY
\#if defined(__DCC__)
typedef struct {
int next_arg;
int *mem_ptr;
int *reg_ptr;
} va_list;
\#else /* ! defined(__DCC__) */
typedef struct {
int __va_arg; /* argument number */
int *__va_stk; /* start of args passed on stack */
int *__va_reg; /* start of args passed in regs */
} va_list;
\#endif /* ! defined(__DCC__) */
\#elif _IX86_ANY
\#if defined(__GNUC__) || defined(__STDC__)
typedef void * va_list;
\#else
typedef char * va_list;
\#endif
\#endif /* _IX86_ANY */
\#endif /* __LINT__ */
\#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */
\#endif /* #ifndef __INT_VARARGS_H */\n";
};
/*
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
* This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n)
*/
fix = {
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
hackname = AAB_fd_zero_asm_posix_types_h;
files = asm/posix_types.h;
mach = 'i[34567]86-*-linux-gnu*';
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
bypass = '} while';
/*
* Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not
* the start, so that if #include_next gets another instance of
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <asm/posix_types.h>.
*/
replace =
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
'/* This file fixes a bug in the __FD_ZERO macro
for older versions of the Linux kernel. */
\#ifndef _POSIX_TYPES_H_WRAPPER
\#include <features.h>
\#include_next <asm/posix_types.h>
\#if defined(__FD_ZERO) && !defined(__GLIBC__)
\#undef __FD_ZERO
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
\#define __FD_ZERO(fdsetp) \\
do { \\
int __d0, __d1; \\
__asm__ __volatile__("cld ; rep ; stosl" \\
: "=&c" (__d0), "=&D" (__d1) \\
: "a" (0), "0" (__FDSET_LONGS), \\
"1" ((__kernel_fd_set *) (fdsetp)) :"memory"); \\
} while (0)
\#endif
\#define _POSIX_TYPES_H_WRAPPER
\#endif /* _POSIX_TYPES_H_WRAPPER */
';
};
/*
* This fixes __FD_ZERO bug for glibc-1.x
*/
fix = {
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
hackname = AAB_fd_zero_gnu_types_h;
files = gnu/types.h;
mach = 'i[34567]86-*-linux-gnu*';
/*
* Define _TYPES_H_WRAPPER at the end of the wrapper, not
* the start, so that if #include_next gets another instance of
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <gnu/types.h>.
*/
replace =
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
'/* This file fixes a bug in the __FD_ZERO macro present in glibc 1.x. */
\#ifndef _TYPES_H_WRAPPER
\#include <features.h>
\#include_next <gnu/types.h>
\#if defined(__FD_ZERO) && !defined(__GLIBC__)
\#undef __FD_ZERO
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
\# define __FD_ZERO(fdsetp) \\
do { \\
int __d0, __d1; \\
__asm__ __volatile__("cld ; rep ; stosl" \\
: "=&c" (__d0), "=&D" (__d1) \\
: "a" (0), "0" (__FDSET_LONGS), \\
"1" ((__fd_set *) (fdsetp)) :"memory"); \\
} while (0)
\#endif
\#define _TYPES_H_WRAPPER
\#endif /* _TYPES_H_WRAPPER */
';
};
/*
* This fixes __FD_ZERO bug for glibc-2.0.x
*/
fix = {
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
hackname = AAB_fd_zero_selectbits_h;
files = selectbits.h;
mach = 'i[34567]86-*-linux-gnu*';
/*
* Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not
* the start, so that if #include_next gets another instance of
* the wrapper, this will follow the #include_next chain until
* we arrive at the real <selectbits.h>.
*/
replace =
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
'/* This file fixes a bug in the __FD_ZERO macro present in glibc 2.0.x. */
\#ifndef _SELECTBITS_H_WRAPPER
\#include <features.h>
\#include_next <selectbits.h>
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
\#if defined(__FD_ZERO) && defined(__GLIBC__) \\
&& defined(__GLIBC_MINOR__) && __GLIBC__ == 2 \\
&& __GLIBC_MINOR__ == 0
\#undef __FD_ZERO
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
\#define __FD_ZERO(fdsetp) \\
do { \\
int __d0, __d1; \\
__asm__ __volatile__ ("cld; rep; stosl" \\
: "=&c" (__d0), "=&D" (__d1) \\
: "a" (0), "0" (sizeof (__fd_set) \\
/ sizeof (__fd_mask)), \\
"1" ((__fd_mask *) (fdsetp)) \\
: "memory"); \\
} while (0)
\#endif
\#define _SELECTBITS_H_WRAPPER
\#endif /* _SELECTBITS_H_WRAPPER */
';
};
/*
* Fix non-ANSI memcpy declaration that conflicts with gcc's builtin
* declaration on Sun OS 4.x. We must only fix this on Sun OS 4.x, because
* many other systems have similar text but correct versions of the file.
* To ensure only Sun's is fixed, we grep for a likely unique string.
* Fix also on sysV68 R3V7.1 (head/memory.h\t50.1\t )
*/
fix = {
hackname = AAB_sun_memcpy;
files = memory.h;
select = "/\\*\t@\\(#\\)"
"(head/memory.h\t50.1\t "
"|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
replace =
'/* This file was generated by fixincludes */
\#ifndef __memory_h__
\#define __memory_h__
\#ifdef __STDC__
extern void *memccpy();
extern void *memchr();
extern void *memcpy();
extern void *memset();
\#else
extern char *memccpy();
extern char *memchr();
extern char *memcpy();
extern char *memset();
\#endif /* __STDC__ */
extern int memcmp();
\#endif /* __memory_h__ */
';
};
/*
* Completely replace <sys/byteorder.h>; with a file that implements gcc's
* optimized byteswapping. Restricted to "SVR4" machines until either
* it is shown to be safe to replace this file always, or we get bolder ;-)
*/
fix = {
hackname = AAB_svr4_replace_byteorder;
#ifndef SVR5
mach = "*-*-sysv4*";
mach = "i[34567]86-*-sysv5*";
mach = "i[34567]86-*-udk*";
mach = "i[34567]86-*-solaris2.[0-4]";
mach = "powerpcle-*-solaris2.[0-4]";
mach = "sparc-*-solaris2.[0-4]";
#endif /* SVR5 */
files = sys/byteorder.h;
replace = '#ifndef _SYS_BYTEORDER_H
\#define _SYS_BYTEORDER_H
/* Functions to convert `short\' and `long\' quantities from host byte order
to (internet) network byte order (i.e. big-endian).
Written by Ron Guilmette (rfg@ncd.com).
This isn\'t actually used by GCC. It is installed by fixinc.svr4.
For big-endian machines these functions are essentially no-ops.
For little-endian machines, we define the functions using specialized
asm sequences in cases where doing so yields better code (e.g. i386). */
\#if !defined (__GNUC__) && !defined (__GNUG__)
\#error You lose! This file is only useful with GNU compilers.
\#endif
\#ifndef __BYTE_ORDER__
/* Byte order defines. These are as defined on UnixWare 1.1, but with
double underscores added at the front and back. */
\#define __LITTLE_ENDIAN__ 1234
\#define __BIG_ENDIAN__ 4321
\#define __PDP_ENDIAN__ 3412
\#endif
\#ifdef __STDC__
static __inline__ unsigned long htonl (unsigned long);
static __inline__ unsigned short htons (unsigned int);
static __inline__ unsigned long ntohl (unsigned long);
static __inline__ unsigned short ntohs (unsigned int);
\#endif /* defined (__STDC__) */
\#if defined (__i386__)
\#ifndef __BYTE_ORDER__
\#define __BYTE_ORDER__ __LITTLE_ENDIAN__
\#endif
/* Convert a host long to a network long. */
/* We must use a new-style function definition, so that this will also
be valid for C++. */
static __inline__ unsigned long
htonl (unsigned long __arg)
{
register unsigned long __result;
__asm__ ("xchg%B0 %b0,%h0
ror%L0 $16,%0
xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
return __result;
}
/* Convert a host short to a network short. */
static __inline__ unsigned short
htons (unsigned int __arg)
{
register unsigned short __result;
__asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
return __result;
}
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
\#elif ((defined (__i860__) && !defined (__i860_big_endian__)) \\
|| defined (__ns32k__) || defined (__vax__) \\
|| defined (__spur__) || defined (__arm__))
\#ifndef __BYTE_ORDER__
\#define __BYTE_ORDER__ __LITTLE_ENDIAN__
\#endif
/* For other little-endian machines, using C code is just as efficient as
using assembly code. */
/* Convert a host long to a network long. */
static __inline__ unsigned long
htonl (unsigned long __arg)
{
register unsigned long __result;
__result = (__arg >> 24) & 0x000000ff;
__result |= (__arg >> 8) & 0x0000ff00;
__result |= (__arg << 8) & 0x00ff0000;
__result |= (__arg << 24) & 0xff000000;
return __result;
}
/* Convert a host short to a network short. */
static __inline__ unsigned short
htons (unsigned int __arg)
{
register unsigned short __result;
__result = (__arg << 8) & 0xff00;
__result |= (__arg >> 8) & 0x00ff;
return __result;
}
\#else /* must be a big-endian machine */
\#ifndef __BYTE_ORDER__
\#define __BYTE_ORDER__ __BIG_ENDIAN__
\#endif
/* Convert a host long to a network long. */
static __inline__ unsigned long
htonl (unsigned long __arg)
{
return __arg;
}
/* Convert a host short to a network short. */
static __inline__ unsigned short
htons (unsigned int __arg)
{
return __arg;
}
\#endif /* big-endian */
/* Convert a network long to a host long. */
static __inline__ unsigned long
ntohl (unsigned long __arg)
{
return htonl (__arg);
}
/* Convert a network short to a host short. */
static __inline__ unsigned short
ntohs (unsigned int __arg)
{
return htons (__arg);
}
\#endif
';
};
/*
* Completely replace <sys/varargs.h> with a file that includes gcc's
* stdarg.h or varargs.h files as appropriate.
*/
#ifdef SVR4
fix = {
hackname = AAB_svr4_no_varargs;
files = sys/varargs.h;
replace = "/* This file was generated by fixincludes. */\n"
"#ifndef _SYS_VARARGS_H\n"
"#define _SYS_VARARGS_H\n\n"
"#ifdef __STDC__\n"
"#include <stdarg.h>\n"
"#else\n"
"#include <varargs.h>\n"
"#endif\n\n"
"#endif /* _SYS_VARARGS_H */\n";
};
#endif
/*
* Cancel out ansi_compat.h on Ultrix. Replace it with an empty file.
*/
fix = {
hackname = AAB_ultrix_ansi_compat;
files = ansi_compat.h;
select = ULTRIX;
replace = "/* This file intentionally left blank. */\n";
};
/*
* sys/wait.h on AIX 3.2.5 puts the declaration of wait3 before the definition
* of struct rusage, so the prototype (added by fixproto) causes havoc.
*/
fix = {
hackname = aix_syswait;
files = sys/wait.h;
select = "bos325,";
sed = "/^extern pid_t wait3();$/i\\\n"
"struct rusage;\n";
};
/*
* sys/signal.h on some versions of AIX uses volatile in the typedef of
* sig_atomic_t, which causes gcc to generate a warning about duplicate
* volatile when a sig_atomic_t variable is declared volatile, as
* required by ANSI C.
*/
fix = {
hackname = aix_volatile;
files = sys/signal.h;
select = "typedef volatile int sig_atomic_t";
sed = "s/typedef volatile int sig_atomic_t"
"/typedef int sig_atomic_t/";
};
/*
* Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
*/
fix = {
hackname = alpha_getopt;
files = "stdio.h";
files = "stdlib.h";
select = 'getopt\(int, char \*\[';
sed = 's/getopt(int, char \*\[\],[ ]*char \*)/'
'getopt(int, char *const[], const char *)/';
};
/*
* Remove erroneous parentheses in sym.h on Alpha OSF/1.
*/
fix = {
hackname = alpha_parens;
files = sym.h;
select = '#ifndef\(__mips64\)';
sed = "s/#ifndef(__mips64)/#ifndef __mips64/";
};
/*
* Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
*/
fix = {
hackname = alpha_sbrk;
files = unistd.h;
select = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
sed = "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/";
};
/*
* Fix this ARM/RISCiX file where ___type is a Compiler
* hint that is specific to the Norcroft compiler.
*/
fix = {
hackname = arm_norcroft_hint;
select = "___type p_type";
files = "X11/Intrinsic.h";
sed = "s/___type p_type/p_type/";
};
/*
* Fix this ARM/RISCiX file to avoid interfering
* with the use of __wchar_t in cc1plus.
*/
fix = {
hackname = arm_wchar;
files = stdlib.h;
select = "#[ \t]*define[ \t]*__wchar_t";
sed = "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
sed = "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
};
/*
* This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89;
* gcc doesn't understand it.
*/
fix = {
hackname = aux_asm;
files = sys/param.h;
select = "#ifndef NOINLINE";
sed = "s|#ifndef NOINLINE"
"|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|";
};
/*
* For C++, avoid any typedef or macro definition of bool,
* and use the built in type instead.
* HP/UX 10.20 also has it in curses_colr/curses.h.
*/
fix = {
hackname = avoid_bool;
files = curses.h;
files = curses_colr/curses.h;
files = term.h;
files = tinfo.h;
select = "char[ \t]+bool|bool[ \t]+char";
bypass = "we must use the C\\+\\+ compiler's type";
sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
"#endif\n";
sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/i\\\n"
"#ifndef __cplusplus\n";
sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/a\\\n"
"#endif\n";
};
/*
* Fix `typedef struct term;' on hppa1.1-hp-hpux9.
*/
fix = {
hackname = bad_struct_term;
files = curses.h;
select = "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
sed = "s/^[ \t]*typedef[ \t][ \t]*"
"\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/";
};
/*
* Fix one other error in this file:
* a mismatched quote not inside a C comment.
*/
fix = {
hackname = badquote;
files = sundev/vuid_event.h;
sed = "s/doesn't/does not/";
};
/*
* Fix #defines under Alpha OSF/1:
* The following files contain '#pragma extern_prefix "_FOO"' followed by
* a '#define something(x,y,z) _FOOsomething(x,y,z)'. The intent of these
* statements is to reduce namespace pollution. While these macros work
* properly in most cases, they don't allow you to take a pointer to the
* "something" being modified. To get around this limitation, change these
* statements to be of the form '#define something _FOOsomething'.
*/
fix = {
hackname = bad_lval;
select = "^[ \t]*#[ \t]*pragma[ \t][ \t]*extern_prefix";
files = libgen.h;
files = dirent.h;
files = ftw.h;
files = grp.h;
files = ndbm.h;
files = pthread.h;
files = pwd.h;
files = signal.h;
files = standards.h;
files = stdlib.h;
files = string.h;
files = stropts.h;
files = time.h;
files = unistd.h;
sed =
"s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*"
"\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/";
};
/*
* check for broken assert.h that needs stdio.h
*/
fix = {
hackname = broken_assert_stdio;
files = assert.h;
select = stderr;
bypass = "include.*stdio.h";
sed = "1i\\\n"
"#include <stdio.h>\n";
};
/*
* check for broken assert.h that needs stdlib.h
*/
fix = {
hackname = broken_assert_stdlib;
files = assert.h;
select = 'exit *\(|abort *\(';
bypass = "include.*stdlib.h";
sed = "1i\\\n"
"#ifdef __cplusplus\\\n"
"#include <stdlib.h>\\\n"
"#endif\n";
};
/*
* Fix <c_asm.h> on Digital UNIX V4.0:
* It contains a prototype for a DEC C internal asm() function,
* clashing with gcc's asm keyword. So protect this with __DECC.
*/
fix = {
hackname = dec_intern_asm;
files = c_asm.h;
sed = "/^[ \t]*float[ \t]*fasm/i\\\n#ifdef __DECC\n";
sed = "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
"#endif\n";
};
/*
* Remove the double-slash comments. The "double_slash" test will
* try to ignore C++ headers by checking for "CC/", "xx/" and "++/"
* in the file name. There are still the occasional C++ headers
* that have their comments stripped. Too bad.
*/
fix = {
hackname = no_double_slash;
c_test = "double_slash";
c_fix = "no_double_slash";
};
/*
* Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
*/
fix = {
hackname = ecd_cursor;
files = "sunwindow/win_lock.h";
files = "sunwindow/win_cursor.h";
sed = "s/ecd.cursor/ecd_cursor/";
};
/*
* On SCO OpenServer 5.0.0 through (at least) 5.0.5 <sys/stat.h> contains
* tiny static wrappers that aren't C++ safe.
*/
fix = {
hackname = sco5_stat_wrappers;
mach = "i*86-*-sco3.2v5*";
files = "sys/stat.h";
sed = "/^static int[ \t]*[a-z]*stat(/i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\"\\\n"
"{\\\n"
"#endif\\\n";
sed = "/^}$/a\\\n"
"#ifdef __cplusplus\\\n"
"}\\\n"
"#endif \/* __cplusplus *\/\\\n";
};
/*
* Fix else and endif directives that contain non-commentary text
*/
fix = {
hackname = end_else_label;
/*
* Select files that contain '#endif' or '#else' directives with
* some sort of following junk.
*/
c_test = "else_endif_label";
c_fix = "else_endif_label";
};
/*
* Fix HP's use of ../machine/inline.h to refer to
* /usr/include/machine/inline.h
*/
fix = {
hackname = hp_inline;
files = sys/spinlock.h;
select = 'include.*"\.\./machine/';
sed = "s,\"../machine/inline.h\",<machine/inline.h>,";
sed = "s,\"../machine/psl.h\",<machine/psl.h>,";
};
/*
* Check for (...) in C++ code in HP/UX sys/file.h.
*/
fix = {
hackname = hp_sysfile;
files = sys/file.h;
select = "HPUX_SOURCE";
sed = 's/(\.\.\.)/(struct file * ...)/';
};
/*
* sys/mman.h on HP/UX is not C++ ready,
* even though NO_IMPLICIT_EXTERN_C is defined on HP/UX.
*
* rpc/types.h on OSF1/2.0 is not C++ ready, even though NO_IMPLICIT_EXTERN_C
* is defined for the alpha. The problem is the declaration of malloc.
*/
fix = {
hackname = cxx_unready;
files = sys/mman.h;
files = rpc/types.h;
select = '[^#]+malloc.*;'; /* Should catch any form of a declaration
but not mention within a macro. */
bypass = '"C"|__BEGIN_DECLS';
sed = "1i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\" {\\\n"
"#endif\\\n\n";
sed = "$a\\\n"
"#ifdef __cplusplus\\\n"
"}\\\n"
"#endif\n";
};
/*
* HPUX 10.x sys/param.h defines MAXINT which clashes with values.h
*/
fix = {
hackname = hpux_maxint;
files = sys/param.h;
sed = "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
"#ifndef MAXINT\n";
sed = "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
"#endif\n";
};
/*
* Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
*/
fix = {
hackname = hpux_systime;
files = sys/time.h;
select = "^extern struct sigevent;";
sed = "s/^extern struct sigevent;/struct sigevent;/";
};
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
/*
* get rid of bogus inline definitions in HP-UX 8.0
*/
fix = {
hackname = hpux8_bogus_inlines;
files = math.h;
select = inline;
sed = "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@";
sed = "s@inline double abs(double [a-z][a-z]*) {.*}@@";
sed = "s@inline int sqr(int [a-z][a-z]*) {.*}@@";
sed = "s@inline double sqr(double [a-z][a-z]*) {.*}@@";
};
/*
* In inttypes.h on HPUX 11, the use of __CONCAT__ in the definition
* of UINT32_C has undefined behavior according to ISO/ANSI:
* the arguments to __CONCAT__ are not macro expanded before the
* concatination happens so the trailing ')' in the first argument
* is concatinated with the 'l' in the second argument creating an
* invalid pp token. The behavior of invalid pp tokens is undefined.
* GCC does not handle these invalid tokens the way the HP compiler does.
* This problem will potentially occur anytime macros are used in the
* arguments to __CONCAT__. A general solution to this problem would be to
* insert another layer of macro between __CONCAT__ and its use
* in UINT32_C. An example of this solution can be found in the C standard.
* A more specific solution, the one used here, is to change the UINT32_C
* macro to not used macros in the arguments to __CONCAT__.
*/
fix = {
hackname = hpux11_uint32_c;
files = inttypes.h;
select = "^#define UINT32_C\\(__c\\)[ \t]*__CONCAT__\\(__CONCAT_U__\\(__c\\),l\\)";
sed = "s/^#define UINT32_C(__c)\\([ \t]*\\)__CONCAT__(__CONCAT_U__(__c),l)/#define UINT32_C(__c)\\1__CONCAT__(__c,ul)/";
};
/*
* On Interactive Unix 2.2, certain traditional Unix definitions
* (notably getc and putc in stdio.h) are omitted if __STDC__ is
* defined, not just if _POSIX_SOURCE is defined. This makes it
* impossible to compile any nontrivial program except with -posix.
*/
fix = {
hackname = isc_omits_with_stdc;
files = "stdio.h";
files = "math.h";
files = "ctype.h";
files = "sys/limits.h";
files = "sys/fcntl.h";
files = "sys/dirent.h";
select = "defined\(__STDC__\) && !defined\(_POSIX_SOURCE\)";
sed = "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/"
"!defined(_POSIX_SOURCE)/";
};
/*
* Fix various macros used to define ioctl numbers. The traditional
* syntax was
* #define _IO(n, x) (('n'<<8)+x)
* #define TIOCFOO _IO(T, 1)
* but this does not work with the C standard, which disallows macro
* expansion inside strings. We have to rewrite it thus:
* #define _IO(n, x) ((n<<8)+x)
* #define TIOCFOO _IO('T', 1)
* The select expressions match too much, but the c_fix code is cautious.
*
* _IO might be: _IO DESIO BSD43__IO with W, R, WR, C, ... suffixes.
*/
fix = {
hackname = io_use_quotes;
select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+IO[A-Z]*[ \t]*\\( *[^,']";
c_fix = IO_use;
};
fix = {
hackname = io_def_quotes;
select = "define[ \t]+[A-Z0-9_]+IO[A-Z]*\\(([a-zA-Z]).*'\\1'";
c_fix = IO_defn;
};
/*
* Same deal for CTRL() macros.
* CTRL might be: CTRL _CTRL ISCTRL BSD43_CTRL ...
*/
fix = {
hackname = ctrl_use_quotes;
select = "define[ \t]+[A-Z0-9_]+[ \t]+[A-Z0-9_]+CTRL[ \t]*\\( *[^,']";
c_fix = CTRL_use;
};
fix = {
hackname = ctrl_def_quotes;
select = "define[ \t]+[A-Z0-9_]+CTRL\\(([a-zA-Z]).*'\\1'";
c_fix = CTRL_defn;
};
/*
* Check for missing ';' in struct
*/
fix = {
hackname = ip_missing_semi;
files = netinet/ip.h;
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = "}$";
sed = "/^struct/,/^};/s/}$/};/";
};
/*
* Some IRIX header files contain the string "//"
*/
fix = {
hackname = irix_multiline_cmnt;
files = sys/types.h;
sed = "s@type of the result@type of the result */@";
sed = "s@of the sizeof@/* of the sizeof@";
};
/*
* IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
* in prototype without previous definition.
*/
fix = {
hackname = irix_sockaddr;
files = rpc/auth.h;
select = "authdes_create.*struct sockaddr";
bypass = "<sys/socket\.h>";
sed = "/authdes_create.*struct sockaddr/i\\\n"
"struct sockaddr;\n";
};
/*
* IRIX 4.0.5 <rpc/xdr.h> uses struct __file_s
* in prototype without previous definition.
*/
fix = {
hackname = irix_struct__file;
files = rpc/xdr.h;
sed = "/xdrstdio_create.*struct __file_s/i\\\n"
"struct __file_s;\n";
};
/*
* IRIX 5.2's <sys/asm.h> contains an asm comment with a contraction
* that causes the assembly preprocessor to complain about an
* unterminated character constant.
*/
fix = {
hackname = irix_asm_apostrophe;
files = sys/asm.h;
select = "^[ \t]*#.*[Ww]e're";
sed = "/^[ \t]*#/s/\\([Ww]e\\)'re/\\1 are/";
};
/*
* Fixing ISC fmod declaration
*/
fix = {
hackname = isc_fmod;
files = math.h;
select = 'fmod\(double\)';
sed = "s/fmod(double)/fmod(double, double)/";
};
/*
* Fix nested comments in Motorola's <limits.h> and <sys/limits.h>
*/
fix = {
hackname = motorola_nested;
mach = "m68k-motorola-sysv*";
files = limits.h;
files = sys/limits.h;
sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*"
"/\\* max # bytes atomic in write to a\\)$@\\1 */@";
sed = "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)"
"\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@";
};
/*
* Fixing nested comments in ISC <sys/limits.h>
*/
fix = {
hackname = isc_sys_limits;
files = sys/limits.h;
select = CHILD_MAX;
sed = "/CHILD_MAX/s,/\\* Max, Max,";
sed = "/OPEN_MAX/s,/\\* Max, Max,";
};
/*
* These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
* use / * * / to concatenate tokens.
*/
fix = {
hackname = kandr_concat;
files = "sparc/asm_linkage.h";
files = "sun3/asm_linkage.h";
files = "sun3x/asm_linkage.h";
files = "sun4/asm_linkage.h";
files = "sun4c/asm_linkage.h";
files = "sun4m/asm_linkage.h";
files = "sun4c/debug/asm_linkage.h";
files = "sun4m/debug/asm_linkage.h";
files = "arm/as_support.h";
files = "arm/mc_type.h";
files = "arm/xcb.h";
files = "dev/chardefmac.h";
files = "dev/ps_irq.h";
files = "dev/screen.h";
files = "dev/scsi.h";
files = "sys/tty.h";
files = "Xm.acorn/XmP.h";
files = bsd43/bsd43_.h;
select = '/\*\*/';
sed = 's|/\*\*/|##|g';
};
/*
* In limits.h, put #ifndefs around things that are supposed to be defined
* in float.h to avoid redefinition errors if float.h is included first.
* On HP/UX this patch does not work, because on HP/UX limits.h uses
* multi line comments and the inserted #endif winds up inside the
* comment. Fortunately, HP/UX already uses #ifndefs in limits.h; if
* we find a #ifndef FLT_MIN we assume that all the required #ifndefs
* are there, and we do not add them ourselves.
* Also fix a nested comment problem in sys/limits.h on Motorola sysV68 R3V7.1
*/
fix = {
hackname = limits_ifndefs;
files = "limits.h";
files = "sys/limits.h";
bypass = "ifndef[ \t]+FLT_MIN";
sed = "/[ \t]FLT_MIN[ \t]/i\\\n#ifndef FLT_MIN\n";
sed = "/[ \t]FLT_MIN[ \t]/a\\\n#endif\n";
sed = "/[ \t]FLT_MAX[ \t]/i\\\n#ifndef FLT_MAX\n";
sed = "/[ \t]FLT_MAX[ \t]/a\\\n#endif\n";
sed = "/[ \t]FLT_DIG[ \t]/i\\\n#ifndef FLT_DIG\n";
sed = "/[ \t]FLT_DIG[ \t]/a\\\n#endif\n";
sed = "/[ \t]DBL_MIN[ \t]/i\\\n#ifndef DBL_MIN\n";
sed = "/[ \t]DBL_MIN[ \t]/a\\\n#endif\n";
sed = "/[ \t]DBL_MAX[ \t]/i\\\n#ifndef DBL_MAX\n";
sed = "/[ \t]DBL_MAX[ \t]/a\\\n#endif\n";
sed = "/[ \t]DBL_DIG[ \t]/i\\\n#ifndef DBL_DIG\n";
sed = "/[ \t]DBL_DIG[ \t]/a\\\n#endif\n";
sed = "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/";
};
/*
* Delete the '#define void int' line from curses.h on Lynx
*/
fix = {
hackname = lynx_void_int;
files = curses.h;
select = "#[ \t]*define[ \t]+void[ \t]+int";
sed = "/#[ \t]*define[ \t][ \t]*void[ \t]int/d";
};
/*
* Fix fcntl prototype in fcntl.h on LynxOS.
*/
fix = {
hackname = lynxos_fcntl_proto;
files = fcntl.h;
select = 'fcntl.*\(int, int, int\)';
sed = 's/\(fcntl.*(int, int, \)int)/\1...)/';
};
/*
* libm.a on m88k-motorola-sysv3 contains a stupid optimization for
* function hypot(), which returns the second argument without even
* looking at its value, if the other is 0.0. Another drawback is
* that fix-header doesn't fix fabs' prototype, and I have no idea why.
*/
fix = {
hackname = m88k_bad_hypot_opt;
mach = "m88k-motorola-sysv3*";
files = "math.h";
sed = "s/extern double floor(), ceil(), fmod(), fabs();/"
"extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/";
sed = "/^extern double hypot();$/a\\\n"
"\\/* Workaround a stupid Motorola optimization if one\\\n"
" of x or y is 0.0 and the other is negative! *\\/\\\n"
"#ifdef __STDC__\\\n"
"static __inline__ double fake_hypot (double x, double y)\\\n"
"#else\\\n"
"static __inline__ double fake_hypot (x, y)\\\n"
"\tdouble x, y;\\\n"
"#endif\\\n"
"{\\\n"
"\treturn fabs (hypot (x, y));\\\n"
"}\\\n"
"#define hypot\tfake_hypot\n";
};
/*
* Fix incorrect S_IF* definitions on m88k-sysv3.
*/
fix = {
hackname = m88k_bad_s_if;
mach = "m88k-*-sysv3*";
files = sys/stat.h;
select = "#define[ \t]+S_IS[A-Z]*(m)[ \t]";
sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
"(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/"
"\\1 (((m)\\&S_IFMT)==\\2)/";
sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
"(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/"
"\\1 (((m)\\&S_IFMT)==\\2)/";
};
/*
* Put cpp wrappers around these include files to avoid redeclaration
* errors during multiple inclusion on m88k-tektronix-sysv3.
*/
fix = {
hackname = m88k_multi_incl;
mach = "m88k-tektronix-sysv3*";
files = "time.h";
bypass = "#ifndef";
shell =
"echo Fixing $file, to protect against multiple inclusion. >&2
cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`
echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"
echo \"#define __GCC_GOT_${cpp_wrapper}_\"
cat
echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"";
};
/*
* Fix BSD machine/ansi.h to use __builtin_va_list to define _BSD_VA_LIST_.
*/
fix = {
hackname = machine_ansi_h_va_list;
files = machine/ansi.h;
select = '_BSD_VA_LIST_';
bypass = '__builtin_va_list';
sed = "s/\\(_BSD_VA_LIST_[ \t][ \t]*\\).*$/\\1__builtin_va_list/";
};
/*
* Fix non-ansi machine name defines
*/
fix = {
hackname = machine_name;
c_test = machine_name;
c_fix = machine_name;
};
/*
* Some math.h files define struct exception, which conflicts with
* the class exception defined in the C++ file std/stdexcept.h. We
* redefine it to __math_exception. This is not a great fix, but I
* haven't been able to think of anything better.
*/
fix = {
hackname = math_exception;
files = math.h;
select = "struct exception";
bypass = "We have a problem when using C\\+\\+";
sed = "/struct exception/i\\\n"
"#ifdef __cplusplus\\\n"
"#define exception __math_exception\\\n"
"#endif\n";
sed = "/struct exception/a\\\n"
"#ifdef __cplusplus\\\n"
"#undef exception\\\n"
"#endif\n";
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
#ifdef MATH_EXCEPTION_FIXED
sed = "/matherr/i\\\n"
"#ifdef __cplusplus\\\n"
"#define exception __math_exception\\\n"
"#endif\n";
sed = "/matherr/a\\\n"
"#ifdef __cplusplus\\\n"
"#undef exception\\\n"
"#endif\n";
I think this patch needs some more thinking.
This is from SVR4.2 (With '#' replaced with '@').
Perhaps we could do without the "/matherr/a" entries?
Can we bypass the entire fix if someone was astute
enough to have '#ifdef __cplusplus' anywhere in the file?
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
We can definitely do without the "/matherr/a" entries. They are
there to cover the case where matherr is declared with no prototype
-- extern int matherr(); -- but we don't need a fix then since there
is no reference to struct exception.
Bypassing on "#ifdef __cplusplus" is too optimistic, but I've stuck
in a bypass for the comment in the glibc 2.1 header that indicates
awareness of the problem. Hmm. Could we use a shell test that did
cpp -D__cplusplus | grep "struct exception" ?
*** /usr/include/math.h Fri Apr 3 18:54:59 1998
--- math.h Sun May 9 07:28:58 1999
***************
*** 25,31 ****
--- 25,37 ----
@ifndef __cplusplus
+ @ifdef __cplusplus
+ @define exception __math_exception
+ @endif
struct exception
+ @ifdef __cplusplus
+ @undef exception
+ @endif
{
int type;
char *name;
***************
*** 34,40 ****
--- 40,58 ----
double retval;
};
+ @ifdef __cplusplus
+ @define exception __math_exception
+ @endif
+ @ifdef __cplusplus
+ @define exception __math_exception
+ @endif
extern int matherr(struct exception *);
+ @ifdef __cplusplus
+ @undef exception
+ @endif
+ @ifdef __cplusplus
+ @undef exception
+ @endif
@endif /*__cplusplus*/
#endif
};
fix = {
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
hackname = math_huge_val_from_dbl_max;
files = math.h;
/*
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
* IF HUGE_VAL is defined to be DBL_MAX *and* DBL_MAX is _not_ defined
* in math.h, this fix applies.
*/
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = "define[ \t]*HUGE_VAL[ \t]*DBL_MAX";
bypass = "define[ \t]*DBL_MAX";
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
shell =
/*
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
* See if we have a definition for DBL_MAX in float.h.
* If we do, we will replace the one in math.h with that one.
*/
"\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h "
"2>/dev/null`\n\n"
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
"\tif ( test -n \"${dbl_max_def}\" ) > /dev/null 2>&1\n"
"\tthen sed -e '/define[ \t]*HUGE_VAL[ \t]*DBL_MAX/"
"s/DBL_MAX/'\"$dbl_max_def/\"\n"
"\telse cat\n"
"\tfi";
};
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
/*
* In any case, put #ifndef .. #endif around #define HUGE_VAL in math.h.
*/
fix = {
hackname = math_huge_val_ifndef;
files = math/math.h;
select = "define[ \t]*HUGE_VAL";
sed = "/define[ \t]HUGE_VAL[ \t]/i\\\n#ifndef HUGE_VAL\n";
sed = "/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n";
};
/*
* nested comment
*/
fix = {
hackname = nested_comment;
files = rpc/rpc.h;
sed = 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@';
};
/*
* fix bogus recursive stdlib.h in NEWS-OS 4.0C
*/
fix = {
hackname = news_os_recursion;
files = stdlib.h;
select = "#include <stdlib.h>";
sed = "/^#include <stdlib.h>/i\\\n"
"#ifdef BOGUS_RECURSION\n";
sed = "/^#include <stdlib.h>/a\\\n"
"#endif\n";
};
/*
* NeXT 3.2 adds const prefix to some math functions.
* These conflict with the built-in functions.
*/
fix = {
hackname = next_math_prefix;
files = ansi/math.h;
select = "^extern.*double.*__const__.*";
sed = "/^extern.*double.*__const__.*sqrt(/s/__const__//";
sed = "/^extern.*double.*__const__.*fabs(/s/__const__//";
sed = "/^extern.*double.*__const__.*cos(/s/__const__//";
sed = "/^extern.*double.*__const__.*hypot(/s/__const__//";
sed = "/^extern.*double.*__const__.*sin(/s/__const__//";
};
/*
* NeXT 3.2 uses the word "template" as a parameter for some
* functions. GCC reports an invalid use of a reserved key word
* with the built-in functions. NeXT 3.2 includes the keyword
* volatile in the prototype for abort(). This conflicts with
* the built-in definition.
*/
fix = {
hackname = next_template;
files = bsd/libc.h;
select = template;
sed = '/\(.*template\)/s/template//';
sed = "/extern.*volatile.*void.*abort/s/volatile//";
};
/*
* NeXT 3.2 includes the keyword volatile in the abort() and exit()
* function prototypes. That conflicts with the built-in functions.
*/
fix = {
hackname = next_volitile;
files = ansi/stdlib.h;
select = volatile;
sed = "/extern.*volatile.*void.*exit/s/volatile//";
sed = "/extern.*volatile.*void.*abort/s/volatile//";
};
/*
* NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
* Note that version 3 of the NeXT system has wait.h in a different directory,
* so that this code won't do anything. But wait.h in version 3 has a
* conditional, so it doesn't need this fix. So everything is okay.
*/
fix = {
hackname = next_wait_union;
files = sys/wait.h;
select = 'wait\(union wait';
sed = "s@wait(union wait@wait(void@";
};
/*
* a missing semi-colon at the end of the nodeent structure definition.
*/
fix = {
hackname = nodeent_syntax;
files = netdnet/dnetdb.h;
sed = "s/char.*na_addr *$/char *na_addr;/";
};
/*
* sys/lc_core.h on some versions of OSF1/4.x pollutes the namespace by
* defining regex.h related types. This causes libg++ build and usage
* failures. Fixing this correctly requires checking and modifying 3 files.
*/
fix = {
hackname = osf_namespace_a;
files = reg_types.h;
files = sys/lc_core.h;
test = " -r reg_types.h";
test = " -r sys/lc_core.h";
test = " -n \"`grep '} regex_t;' reg_types.h`\"";
test = " -z \"`grep __regex_t regex.h`\"";
sed = "s/regex_t/__regex_t/g";
sed = "s/regoff_t/__regoff_t/g";
sed = "s/regmatch_t/__regmatch_t/g";
};
fix = {
hackname = osf_namespace_b;
files = regex.h;
test = " -r reg_types.h";
test = " -r sys/lc_core.h";
test = " -n \"`grep '} regex_t;' reg_types.h`\"";
test = " -z \"`grep __regex_t regex.h`\"";
sed = "/#include <reg_types.h>/a\\\n"
"typedef __regex_t\tregex_t;\\\n"
"typedef __regoff_t\tregoff_t;\\\n"
"typedef __regmatch_t\tregmatch_t;\n";
};
/*
* Fix __page_size* declarations in pthread.h AIX 4.1.[34].
* The original ones fail if uninitialized externs are not common.
* This is the default for all ANSI standard C++ compilers.
*/
fix = {
hackname = pthread_page_size;
files = pthread.h;
select = "^int __page_size";
sed = "s/^int __page_size/extern int __page_size/";
};
/*
* Fix return type of fread and fwrite on sysV68
*/
fix = {
hackname = read_ret_type;
files = stdio.h;
select = "extern int\t.*, fread\\(\\), fwrite\\(\\)";
sed = "s/^\\(extern int\tfclose(), fflush()\\), "
"\\(fread(), fwrite()\\)\\(.*\\)$"
"/extern unsigned int\t\\2;\\\n\\1\\3/";
};
/*
* function class(double x) conflicts with C++ keyword on rs/6000
*/
fix = {
hackname = rs6000_double;
files = math.h;
select = '[^a-zA-Z_]class\(';
sed = "/class[(]/i\\\n#ifndef __cplusplus\n";
sed = "/class[(]/a\\\n#endif\n";
};
/*
* Wrong fchmod prototype on RS/6000.
*/
fix = {
hackname = rs6000_fchmod;
files = sys/stat.h;
select = 'fchmod\(char';
sed = 's/fchmod(char \*/fchmod(int/';
};
/*
* parameters conflict with C++ new on rs/6000
*/
fix = {
hackname = rs6000_param;
files = "stdio.h";
files = "unistd.h";
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = 'const char new';
sed = 's@rename(const char \*old, const char \*new)@'
'rename(const char *_old, const char *_new)@';
};
/*
* Sony NEWSOS 5.0 does not support the complete ANSI C standard.
*/
#ifdef SONY
fix = {
hackname = sony_ctype;
files = ctype.h;
test = " -x /bin/sony";
test = " ! -z \"`if /bin/sony ; then echo true ; fi`\"";
sed = "s/__ctype/_ctype/g";
};
#endif
/*
* Incorrect #include in Sony News-OS 3.2.
*/
fix = {
hackname = sony_include;
files = machine/machparam.h;
select = '"\.\./machine/endian.h"';
sed = 's@"../machine/endian.h"@<machine/endian.h>@';
};
/*
* Sony NEWSOS 5.0 does not support the complete ANSI C standard.
*/
#ifdef SONY
fix = {
hackname = sony_stdio;
files = stdio.h;
test = " -x /bin/sony";
test = " ! -z \"`if /bin/sony ; then echo true ; fi`\"";
sed = "s/__filbuf/_filbuf/g\n"
"s/__flsbuf/_flsbuf/g\n"
"s/__iob/_iob/g";
};
#endif
/*
* Add a `static' declaration of `getrnge' into <regexp.h>.
*
* Don't do this if there is already a `static void getrnge' declaration
* present, since this would cause a redeclaration error. Solaris 2.x has
* such a declaration.
*/
#ifdef SVR4
fix = {
hackname = static_getrnge;
files = regexp.h;
bypass = "static void getrnge";
sed = "/^static int[ \t]*size;/c\\\n"
"static int size ;\\\n\\\n"
"static int getrnge ();";
};
#endif
/*
* a missing semi-colon at the end of the statsswtch structure definition.
*/
fix = {
hackname = statsswtch;
files = rpcsvc/rstat.h;
select = "boottime$";
sed = "s/boottime$/boottime;/";
};
/*
* Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
* On 4BSD-derived systems, stdio.h defers to machine/ansi.h; that's
* OK too.
*/
fix = {
hackname = stdio_stdarg_h;
files = stdio.h;
bypass = "include.*(stdarg\.h|machine/ansi\.h)";
sed = '1i\\
\#define __need___va_list\\
\#include <stdarg.h>
';
};
/*
* Don't use or define the name va_list in stdio.h.
* This is for ANSI and also to interoperate properly with gcc's varargs.h.
* Note _BSD_VA_LIST_ is dealt with elsewhere.
*/
fix = {
hackname = stdio_va_list;
files = stdio.h;
bypass = '__gnuc_va_list|_BSD_VA_LIST_';
/*
* Use __gnuc_va_list in arg types in place of va_list.
* On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
* trailing parentheses and semicolon save all other systems from this.
* Define __not_va_list__ (something harmless and unused)
* instead of va_list.
* Don't claim to have defined va_list.
*/
sed = "s@ va_list @ __gnuc_va_list @\n"
"s@ va_list)@ __gnuc_va_list)@\n"
"s@ _VA_LIST_));@ __gnuc_va_list));@\n"
"s@ va_list@ __not_va_list__@\n"
"s@\\*va_list@*__not_va_list__@\n"
"s@ __va_list)@ __gnuc_va_list)@\n"
"s@GNUC_VA_LIST@GNUC_Va_LIST@\n"
"s@_NEED___VA_LIST@_NEED___Va_LIST@\n"
"s@VA_LIST@DUMMY_VA_LIST@\n"
"s@_Va_LIST@_VA_LIST@";
};
/*
* Check for strict ansi compliance
*/
#ifdef STRICT_ANSI
fix = {
hackname = strict_ansi;
select = "__STDC__[ \t]*[=!]=[ \t]*[01]";
sed = "s/__STDC__[ \t]*==[ \t]*0/!defined (__STRICT_ANSI__)/g";
sed = "s/__STDC__[ \t]*!=[ \t]*0/defined (__STRICT_ANSI__)/g";
sed = "s/__STDC__[ \t]*==[ \t]*1/defined (__STRICT_ANSI__)/g";
sed = "s/__STDC__[ \t]*!=[ \t]*1/!defined (__STRICT_ANSI__)/g";
};
#endif
/*
* Fix bogus #ifdef on SunOS 4.1.
*/
fix = {
hackname = sun_bogus_ifdef;
files = "hsfs/hsfs_spec.h";
files = "hsfs/iso_spec.h";
select = '#ifdef __i386__ || __vax__';
sed = "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g";
};
/*
* Fix bogus #ifdef on SunOS 4.1.
*/
fix = {
hackname = sun_bogus_ifdef_sun4c;
files = "hsfs/hsnode.h";
select = '#ifdef __i386__ || __sun4c__';
sed = "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g";
};
/*
* Fix the CAT macro in SunOS memvar.h.
*/
fix = {
hackname = sun_catmacro;
files = pixrect/memvar.h;
select = "^#define[ \t]+CAT\\(a,b\\)";
sed = "/^#define[ \t]CAT(a,b)/ i\\\n"
"#ifdef __STDC__ \\\n"
"#define CAT(a,b) a##b\\\n"
"#else\n";
sed = "/^#define[ \t]CAT(a,b)/ a\\\n"
"#endif\n";
};
/*
* Fix return type of free and {c,m,re}alloc in <malloc.h> on SunOS 4.1.
* Also fix return type of {m,re}alloc in <malloc.h> on sysV68
*/
fix = {
hackname = sun_malloc;
files = malloc.h;
sed = "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g";
sed = "s/int[ \t][ \t]*free/void\tfree/g";
sed = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g";
sed = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g";
};
/*
* Check for yet more missing ';' in struct (in SunOS 4.0.x)
*/
fix = {
hackname = sun_rusers_semi;
files = rpcsvc/rusers.h;
select = "_cnt$";
sed = "/^struct/,/^};/s/_cnt$/_cnt;/";
};
/*
* signal.h on SunOS defines signal using (),
* which causes trouble when compiling with g++ -pedantic.
*/
fix = {
hackname = sun_signal;
files = sys/signal.h;
files = signal.h;
select = "^void\t" '\(\*signal\(\)\)\(\);';
sed = "/^void\t" '(\*signal())();$/i' "\\\n"
"#ifdef __cplusplus" "\\\n"
"void\t(*signal(...))(...);" "\\\n"
"#else" "\n";
sed = "/^void\t" '(\*signal())();$/a' "\\\n"
'#endif' "\n";
};
/*
* Apply fix this to all OSs since this problem seems to effect
* more than just SunOS. In general, fixes which are triggered
* by a specific target are bad.
*/
fix = {
hackname = sun_auth_proto;
files = rpc/auth.h;
files = rpc/clnt.h;
files = rpc/svc.h;
files = rpc/xdr.h;
/*
* Select those files containing '(*name)()'.
*/
select = '\(\*[a-z][a-z_]*\)\(\)';
sed = 's'
'/^\(.*(\*[a-z][a-z_]*)(\)' '\();.*\)'
"/\\\n"
"#ifdef __cplusplus\\\n"
'\1...\2' "\\\n"
"#else\\\n"
'\1\2' "\\\n"
"#endif"
"/";
};
/*
* math.h on SunOS 4 puts the declaration of matherr before the definition
* of struct exception, so the prototype (added by fixproto) causes havoc.
*/
fix = {
hackname = sunos_matherr_decl;
files = math.h;
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
/* If matherr has a prototype already, the header needs no fix. */
bypass = 'matherr.*struct exception';
/*
* Once a declaration for 'struct exception' is found,
* stop trying to insert a forward reference for it.
*/
sed = "/^struct exception/,$b";
sed = "/matherr/i\\\nstruct exception;\n";
};
/*
* Correct the return type for strlen in strings.h in SunOS 4.
*/
fix = {
hackname = sunos_strlen;
files = strings.h;
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = "int[ \t]*strlen";
sed = "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/";
};
/*
* Solaris math.h and floatingpoint.h define __P without protection,
* which conflicts with the fixproto definition. The fixproto
* definition and the Solaris definition are used the same way.
*/
#ifdef SVR4
fix = {
hackname = svr4__p;
files = math.h;
files = floatingpoint.h;
select = "^#define[ \t]*__P";
sed = "/^#define[ \t]*__P/i\\\n#ifndef __P\n";
sed = "/^#define[ \t]*__P/a\\\n#endif\n";
};
#endif
/*
* Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
* that is visible to any ANSI compiler using this include. Simply
* delete the lines that #define some string functions to internal forms.
*/
#ifdef SVR4
fix = {
hackname = svr4_disable_opt;
files = string.h;
select = '#define.*__std_hdr_';
sed = '/#define.*__std_hdr_/d';
};
#endif
/*
* Conditionalize some of <sys/endian.h> on __GNUC__ and __GNUG__.
* On some systems (UnixWare 2, UnixWare 7), the file is byteorder.h
* but we still "hijack" it and redirect it to the GNU byteorder.h..
*
*
*/
#ifdef SVR5
fix = {
hackname = svr4_endian;
files = sys/endian.h;
#ifdef LATER
/*
* since we emit our own sys/byteorder.h,
* this fix can never be applied to that file.
*/
files = sys/byteorder.h;
#endif
bypass = '__GNUC__';
sed = "/#\tifdef\t__STDC__/i\\\n"
"# if !defined (__GNUC__) && !defined (__GNUG__)\n";
sed = "/#\t\tinclude\t<sys\\/byteorder.h>/s/\t\t/ /";
sed = "/# include\t<sys\\/byteorder.h>/i\\\n"
"# endif /* !defined (__GNUC__) && !defined (__GNUG__) */\n";
};
#endif /* SVR5 */
/*
* Remove useless extern keyword from struct forward declarations
* in <sys/stream.h> and <sys/strsubr.h>
*/
#ifdef SVR4
fix = {
hackname = svr4_extern_struct;
files = sys/stream.h;
files = sys/strsubr.h;
select = 'extern struct [a-z_]*;';
sed = 's/extern struct \([a-z][a-z_]*\)/struct \1/';
};
#endif
/*
* Fix declarations of `ftw' and `nftw' in <ftw.h>. On some/most SVR4
* systems the file <ftw.h> contains extern declarations of these
* functions followed by explicitly `static' definitions of these
* functions... and that's not allowed according to ANSI C. (Note
* however that on Solaris, this header file glitch has been pre-fixed by
* Sun. In the Solaris version of <ftw.h> there are no static
* definitions of any function so we don't need to do any of this stuff
* when on Solaris.
*/
#ifdef SVR4
#ifndef SOLARIS
fix = {
hackname = svr4_ftw;
files = ftw.h;
select = '^extern int ftw\(const';
sed = '/^extern int ftw(const/i' "\\\n"
"#if !defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif";
sed = 's/extern \(int ftw(const.*\)$/\1/';
sed = "/^extern int nftw/i\\\n"
"#if defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif";
sed = 's/extern \(int nftw.*\)$/\1/';
sed = "/^extern int ftw(),/c\\\n"
"#if !defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif\\\n"
" int ftw();\\\n"
"#if defined(_STYPES)\\\n"
"static\\\n"
"#else\\\n"
"extern\\\n"
"#endif\\\n"
" int nftw();";
};
#endif
#endif
/*
* Fix broken decl of getcwd present on some svr4 systems.
*/
#ifdef SVR4
fix = {
hackname = svr4_getcwd;
files = stdlib.h;
files = unistd.h;
select = 'getcwd\(char \*, int\)';
sed = 's/getcwd(char \*, int)/getcwd(char *, size_t)/';
};
#endif
/*
* set ifdef _KERNEL
*/
#ifdef SVR4
fix = {
hackname = svr4_kernel;
files = fs/rfs/rf_cache.h;
files = sys/erec.h;
files = sys/err.h;
files = sys/char.h;
files = sys/getpages.h;
files = sys/map.h;
files = sys/cmn_err.h;
files = sys/kdebugger.h;
bypass = '_KERNEL';
sed = "1i\\\n#ifdef _KERNEL";
sed = "$a\\\n#endif /* _KERNEL */";
};
#endif
/*
* Delete any #defines of `__i386' which may be present in <ieeefp.h>. They
* tend to conflict with the compiler's own definition of this symbol. (We
* will use the compiler's definition.)
* Likewise __sparc, for Solaris, and __i860, and a few others
* (guessing it is necessary for all of them).
*/
#ifdef SVR4
fix = {
hackname = svr4_mach_defines;
files = ieeefp.h;
select = "#define[ \t]*__(i386|i860|mips|sparc|m88k|m68k)[ \t]";
sed = "/#define[ \t]*__\\(i386|i860|mips|sparc|m88k|m68k\\)[ \t]/d";
};
#endif
/*
* Fix declarations of `makedev', `major', and `minor' in <sys/mkdev.h>.
* They are declared as non-static then immediately redeclared as static.
*/
#ifdef SVR5
fix = {
hackname = svr4_mkdev;
files = sys/mkdev.h;
select = '^static';
sed = "/^dev_t makedev(/s/^/static /";
sed = "/^major_t major(/s/^/static /";
sed = "/^minor_t minor(/s/^/static /";
};
#endif /* SVR5 */
/*
* Fix reference to NC_NPI_RAW in <sys/netcspace.h>.
* Also fix types of array initializers.
*/
#ifdef SVR4
fix = {
hackname = svr4_netcspace;
files = sys/netcspace.h;
select = 'NC_NPI_RAW';
sed = 's/NC_NPI_RAW/NC_TPI_RAW/g';
sed = 's/NC_/(unsigned long) NC_/';
};
#endif
/*
* Fix reference to NMSZ in <sys/adv.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_nmsz;
files = sys/adv.h;
select = '\[NMSZ\]';
sed = 's/\[NMSZ\]/\[RFS_NMSZ\]/g';
};
#endif
/*
* Fix broken decl of profil present on some svr4 systems.
*/
#ifdef SVR4
fix = {
hackname = svr4_profil;
files = stdlib.h;
files = unistd.h;
sed = 's/profil(unsigned short \*, unsigned int, '
'unsigned int, unsigned int)'
'/profil(unsigned short *, size_t, int, unsigned)/';
};
#endif
/*
* Convert functions to prototype form, and fix arg names in <sys/stat.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_proto_form;
files = sys/stat.h;
select = 'const extern';
sed = "/^stat([ \t]*[^c]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^lstat([ \t]*[^c]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^fstat([ \t]*[^i]/ {\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /\n"
"s/;$/)/\n" "}";
sed = "/^mknod([ \t]*[^c]/{\nN\nN\nN\n"
"s/(.*)\\n/( /\n"
"s/;\\n/, /g\n"
"s/;$/)/\n" "}";
sed = "1,$s/\\([^A-Za-z]\\)path\\([^A-Za-z]\\)/\\1__path\\2/g";
sed = "1,$s/\\([^A-Za-z]\\)buf\\([^A-Za-z]\\)/\\1__buf\\2/g";
sed = "1,$s/\\([^A-Za-z]\\)fd\\([^A-Za-z]\\)/\\1__fd\\2/g";
sed = "1,$s/ret\\([^u]\\)/__ret\\1/g";
sed = "1,$s/\\([^_]\\)mode\\([^_]\\)/\\1__mode\\2/g";
sed = "1,$s/\\([^_r]\\)dev\\([^_]\\)/\\1__dev\\2/g";
};
#endif
/*
* Add a prototyped declaration of mmap to <sys/mman.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_proto_mmap;
files = sys/mman.h;
select = '^extern caddr_t mmap();$';
sed = '/^extern caddr_t mmap();$/c' "\\\n"
"#ifdef __STDC__\\\n"
"extern caddr_t mmap (caddr_t, size_t, int, int, int, off_t);\\\n"
"#else /* !defined(__STDC__) */\\\n"
"extern caddr_t mmap ();\\\n"
"#endif /* !defined(__STDC__) */\\\n";
};
#endif
/*
* Add a #define of _SIGACTION_ into <sys/signal.h>.
*/
#ifdef SVR4
fix = {
hackname = svr4_sigaction;
files = sys/signal.h;
sed = "/^struct sigaction {/i\\\n"
"#define _SIGACTION_";
sed = 's/(void *(\*)())/(void (*)(int))/';
};
#endif
/*
* Put storage class at start of decl, to avoid warning.
*/
#ifdef SVR4
fix = {
hackname = svr4_storage_class;
files = rpc/types.h;
select = 'const extern';
sed = 's/const extern/extern const/g';
};
#endif
/*
* Like svr4_mach_defines, but with newfangled syntax.
* Source lines are of #define __i386 #machine(i386). Delete them.
*/
#ifdef SVR5
fix = {
hackname = svr5_mach_defines;
files = ieeefp.h;
select = "#define[ \t]*__i386.*\(i386\)";
sed = "/#define[ \t]*__i386.*/d";
};
#endif /* SVR5 */
/* Fix these files to use the same types that we think they should.
* XXX - extremely dubious changes here.
*/
fix = {
hackname = systypes;
files = "sys/types.h";
files = "stdlib.h";
files = "sys/stdtypes.h";
files = "stddef.h";
files = "memory.h";
files = "unistd.h";
select = "typedef[ \t]+[a-z_][ \ta-z_]*[ \t]"
"(size|ptrdiff|wchar)_t";
sed = "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N";
sed = "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n"
"[ \t]*\\*\\/\\)/\\1\\\n"
"#ifndef __SIZE_TYPE__\\\n"
"#define __SIZE_TYPE__ long unsigned int\\\n"
"#endif\\\n"
"typedef __SIZE_TYPE__ size_t;\\\n/";
sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
"#ifndef __SIZE_TYPE__\\\n"
"#define __SIZE_TYPE__ long unsigned int\\\n"
"#endif\n";
sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/"
"typedef __SIZE_TYPE__ size_t/";
sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
"#ifndef __PTRDIFF_TYPE__\\\n"
"#define __PTRDIFF_TYPE__ long int\\\n"
"#endif\n";
sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/"
"typedef __PTRDIFF_TYPE__ ptrdiff_t/";
sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
"#ifndef __WCHAR_TYPE__\\\n"
"#define __WCHAR_TYPE__ int\\\n"
"#endif\\\n"
"#ifndef __cplusplus\n";
sed = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
"#endif\n";
sed = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/"
"typedef __WCHAR_TYPE__ wchar_t/";
};
/*
* Fix files that may contain a stray definition of size_t. Take care
* not to match ssize_t or mere uses of size_t.
*/
fix = {
hackname = systypes_stdlib_size_t;
files = sys/types.h;
files = stdlib.h;
select = "typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
bypass = "_(GCC|BSD)_SIZE_T";
sed = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n";
sed = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
"#endif\n";
};
/*
* Fix return value of mem{ccpy,chr,cpy,set} and str{len,spn,cspn}
* in string.h on sysV68
* Correct the return type for strlen in string.h on Lynx.
* Correct the argument type for ffs in string.h on Alpha OSF/1 V2.0.
* Add missing const for strdup on OSF/1 V3.0.
* On sysV88 layout is slightly different.
*/
fix = {
hackname = sysv68_string;
files = string.h;
sed = "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/";
sed = "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/";
sed = "s/strdup(char \\*s1);/strdup(const char *s1);/";
sed = "/^extern char$/N";
sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/";
sed = "/^\tstrncmp(),$/N";
sed = "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
"extern unsigned int\\\n\\2/";
sed = "/^extern int$/N";
sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
};
/*
* Fix return type of exit and abort in <stdlib.h>
*/
fix = {
hackname = sysz_stdlib_for_sun;
files = stdlib.h;
sed = "s/int\tabort/void\tabort/g";
sed = "s/int\tfree/void\tfree/g";
sed = "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g";
sed = "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g";
sed = "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g";
sed = "s/char[ \t]*\\*[ \t]*bsearch/void \\*\tbsearch/g";
sed = "s/int[ \t][ \t]*exit/void\texit/g";
};
/*
* Fix this Sun file to avoid interfering with stddef.h.
* We use a funny name to ensure it follows 'systypes' fix.
*/
fix = {
hackname = sysz_stdtypes_for_sun;
files = sys/stdtypes.h;
sed = "/[\t ]size_t.*;/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n";
sed = "/[\t ]size_t.*;/a\\\n"
"#endif\n";
sed = "/[\t ]ptrdiff_t.*;/i\\\n"
"#ifndef _GCC_PTRDIFF_T\\\n"
"#define _GCC_PTRDIFF_T\n";
sed = "/[\t ]ptrdiff_t.*;/a\\\n"
"#endif\n";
sed = "/[\t ]wchar_t.*;/i\\\n"
"#ifndef _GCC_WCHAR_T\\\n"
"#define _GCC_WCHAR_T\n";
sed = "/[\t ]wchar_t.*;/a\\\n"
"#endif\n";
};
/*
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
* if the #if says _cplusplus, not the double underscore __cplusplus
* that it should be
*/
fix = {
hackname = tinfo_cplusplus;
files = tinfo.h;
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = "[ \t]_cplusplus";
sed = "s/[ \t]_cplusplus/ __cplusplus/";
};
/*
* Ultrix V4.[35] puts the declaration of uname before the definition
* of struct utsname, so the prototype (added by fixproto) causes havoc.
*/
fix = {
hackname = ultrix_fix_fixproto;
files = sys/utsname.h;
select = ULTRIX;
sed = "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n"
"struct utsname;\n";
};
/*
* parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R.
*/
fix = {
hackname = ultrix_atof_param;
files = math.h;
fixtests.c (is_cxx_header): New fn, split out of double_slash_test. 1999-12-17 13:21 -0800 Zack Weinberg <zack@rabi.columbia.edu> * fixtests.c (is_cxx_header): New fn, split out of double_slash_test. (else_endif_label): Allow "#endif // comment" in C++ headers, as determined by is_cxx_header. * fixfixes.c (else_endif_label_fix): Update comment. * fixincl.c: Don't output VERB_PROGRESS lines if stdout is not a tty. * genfixes: Correct double thinko in commandline parsing. * hackshell.tpl: Generate correct sh syntax for bypass entries. * inclhack.def (all): Whenever an inserted preprocessor conditional is split over multiple lines, use double backslashes in this file so the fixed header will be readable. (AAB_fd_zero_glibc_1_0): Rename to AAB_fd_zero_asm_posix_types_h and add bypass entry for correct version of this header. (AAB_fd_zero_glibc_1_x): Rename to AAB_fd_zero_gnu_types_h. (AAB_fd_zero_glibc_2_0): Rename to AAB_fd_zero_selectbits_h. (hpux8_bogus_inlines): New fix, split from... (ultrix_atof_param) ... here. (math_expression): Add bypass entry keyed to glibc comment indicating the problem has been dealt with; disable unnecessary sed operations; update commentary. (math_gcc_ifndefs): Rename to math_huge_val_from_dbl_max, add select and bypass entries, simplify shell operation. (math_huge_val_ifndef): Split from math_gcc_ifndefs. (ip_missing_semi, rs6000_param, tinfo_cplusplus, ultrix_atof_param): Add select entry. (stdio_va_list, sunos_mather_decl): Add bypass entry. (systypes_for_aix, sysv86_string, tinfo_cplusplus): Put the comments with the fixes they describe. * fixincl.x, fixincl.sh, inclhack.sh: Regen. From-SVN: r30999
1999-12-17 22:49:30 +01:00
select = "atof\\([ \t]*char";
sed = "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@";
};
/*
* parameters not const on DECstation Ultrix V4.0 and OSF/1.
*/
fix = {
hackname = ultrix_const;
files = stdio.h;
sed = 's@perror( char \*__s );@perror( const char *__s );@';
sed = 's@fputs( char \*__s,@fputs( const char *__s,@';
sed = 's@fopen( char \*__filename, char \*__type );@'
'fopen( const char *__filename, const char *__type );@';
sed = 's@fwrite( void \*__ptr,@fwrite( const void *__ptr,@';
sed = 's@fscanf( FILE \*__stream, char \*__format,@'
'fscanf( FILE *__stream, const char *__format,@';
sed = 's@scanf( char \*__format,@scanf( const char *__format,@';
sed = 's@sscanf( char \*__s, char \*__format,@'
'sscanf( const char *__s, const char *__format,@';
sed = 's@popen(char \*, char \*);@popen(const char *, const char *);@';
sed = 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@';
};
/*
* Check for bad #ifdef line (in Ultrix 4.1)
*/
fix = {
hackname = ultrix_ifdef;
select = "#ifdef KERNEL[ \t]*[^ \t]";
files = sys/file.h;
sed = "s/#ifdef KERNEL/#if defined(KERNEL)/";
};
/*
* Avoid nested comments on Ultrix 4.3.
*/
fix = {
hackname = ultrix_nested_cmnt;
files = rpc/svc.h;
sed = "s@^\\( \\*\tint protocol; \\)/\\*@\\1*/ /*@";
};
/*
* Check for superfluous `static' (in Ultrix 4.2)
* On Ultrix 4.3, includes of other files (r3_cpu.h,r4_cpu.h) is broken.
*/
fix = {
hackname = ultrix_static;
files = machine/cpu.h;
select = '#include "r[34]_cpu';
sed = "s/^static struct tlb_pid_state/struct tlb_pid_state/";
sed = 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/';
sed = 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/';
};
/*
* Fix multiple defines for NULL
*/
fix = {
hackname = undefine_null;
select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
sed = "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
"#undef NULL\n";
};
/*
* If arpa/inet.h prototypes are incompatible with the ones we just
* installed in <sys/byteorder.h>, just remove the protos.
* Because of this close association, this patch must be applied only
* on those systems where the replacement byteorder header is installed.
*/
fix = {
hackname = unixware7_byteorder_fix;
files = arpa/inet.h;
select = "in_port_t";
#ifndef SVR5
mach = "*-*-sysv4*";
mach = "i[34567]86-*-sysv5*";
mach = "i[34567]86-*-udk*";
mach = "i[34567]86-*-solaris2.[0-4]";
mach = "powerpcle-*-solaris2.[0-4]";
mach = "sparc-*-solaris2.[0-4]";
#endif /* SVR5 */
sed = '/^extern.*htons.*(in_port_t)/d';
sed = '/^extern.*ntohs.*(in_port_t)/d';
};
/*
* Fix definitions of macros used by va-i960.h in VxWorks header file.
*/
fix = {
hackname = va_i960_macro;
files = arch/i960/archI960.h;
select = "__(vsiz|vali|vpad|alignof__)";
sed = "s/__vsiz/__vxvsiz/";
sed = "s/__vali/__vxvali/";
sed = "s/__vpad/__vxvpad/";
sed = "s/__alignof__/__vxalignof__/";
};
/*
* AIX headers define NULL to be cast to a void pointer,
* which is illegal in ANSI C++.
*/
fix = {
hackname = void_null;
files = curses.h;
files = dbm.h;
files = locale.h;
files = stdio.h;
files = stdlib.h;
files = string.h;
files = time.h;
files = unistd.h;
files = sys/dir.h;
files = sys/param.h;
files = sys/types.h;
select = "#[ \t]*define[ \t][ \t]*NULL[ \t].*void";
sed = "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)"
"/#define NULL 0/";
};
/*
* Make VxWorks header which is almost gcc ready fully gcc ready.
*/
fix = {
hackname = vxworks_gcc_problem;
files = types/vxTypesBase.h;
select = "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
sed = "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/"
"#if 1/";
sed = "/[ \t]size_t/i\\\n"
"#ifndef _GCC_SIZE_T\\\n"
"#define _GCC_SIZE_T\n";
sed = "/[ \t]size_t/a\\\n"
"#endif\n";
sed = "/[ \t]ptrdiff_t/i\\\n"
"#ifndef _GCC_PTRDIFF_T\\\n"
"#define _GCC_PTRDIFF_T\n";
sed = "/[ \t]ptrdiff_t/a\\\n"
"#endif\n";
sed = "/[ \t]wchar_t/i\\\n"
"#ifndef _GCC_WCHAR_T\\\n"
"#define _GCC_WCHAR_T\n";
sed = "/[ \t]wchar_t/a\\\n"
"#endif\n";
};
/*
* Fix VxWorks <time.h> to not require including <vxTypes.h>.
*/
fix = {
hackname = vxworks_needs_vxtypes;
files = time.h;
select = "uint_t[ \t][ \t]*_clocks_per_sec";
sed = "s/uint_t/unsigned int/";
};
/*
* Fix VxWorks <sys/stat.h> to not require including <vxWorks.h>.
*/
fix = {
hackname = vxworks_needs_vxworks;
files = sys/stat.h;
test = " -r types/vxTypesOld.h";
test = " -n \"`egrep '#include' $file`\"";
test = " -n \"`egrep ULONG $file`\"";
select = "#[ \t]define[ \t][ \t]*__INCstath";
sed = "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
"#include <types/vxTypesOld.h>\n";
};
/*
* Another bad dependency in VxWorks 5.2 <time.h>.
*/
fix = {
hackname = vxworks_time;
files = time.h;
select = "VOIDFUNCPTR";
test = " -r vxWorks.h";
sed = "/VOIDFUNCPTR/i\\\n"
"#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
"#ifdef __cplusplus\\\n"
"typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
"#else\\\n"
"typedef void (*__gcc_VOIDFUNCPTR) ();\\\n"
"#endif\\\n"
"#define __gcc_VOIDFUNCPTR_defined\\\n"
"#endif\n";
sed = "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g";
};
/*
* There are several name conflicts with C++ reserved words in X11 header
* files. These are fixed in some versions, so don't do the fixes if
* we find __cplusplus in the file. These were found on the RS/6000.
*/
fix = {
hackname = x11_class;
files = X11/ShellP.h;
bypass = __cplusplus;
sed = "/char \\*class;/i\\\n"
"#ifdef __cplusplus\\\n"
"\tchar *c_class;\\\n"
"#else\n";
sed = "/char \\*class;/a\\\n"
"#endif\n";
};
/*
* class in Xm/BaseClassI.h
*/
fix = {
hackname = x11_class_usage;
files = Xm/BaseClassI.h;
bypass = "__cplusplus";
sed = "s/ class[)]/ c_class)/g";
};
/*
* new in Xm/Traversal.h
*/
fix = {
hackname = x11_new;
files = Xm/Traversal.h;
bypass = __cplusplus;
sed = "/Widget\told, new;/i\\\n"
"#ifdef __cplusplus\\\n"
"\tWidget\told, c_new;\\\n"
"#else\n";
sed = "/Widget\told, new;/a\\\n"
"#endif\n";
sed = "s/Widget new,/Widget c_new,/g";
};
/*
* Incorrect sprintf declaration in X11/Xmu.h
*/
fix = {
hackname = x11_sprintf;
files = X11/Xmu.h;
files = X11/Xmu/Xmu.h;
select = 'sprintf\(\)';
sed = "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
"extern char *\tsprintf();\\\n"
"#endif /* !defined __STDC__ */,";
};
/*EOF*/