diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-05-14 00:33:14 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-05-14 00:33:14 +0000 |
| commit | c297b7649ce38bda7fd136bcda476009313e4610 (patch) | |
| tree | 5a5e9811281c6cb6c6bd580eb02ade347a06ad9f /gcc/fixinc | |
| parent | 0b42c8f88964203be2c55f86d7507908ab9ce553 (diff) | |
| download | gcc-c297b7649ce38bda7fd136bcda476009313e4610.zip gcc-c297b7649ce38bda7fd136bcda476009313e4610.tar.gz gcc-c297b7649ce38bda7fd136bcda476009313e4610.tar.bz2 | |
inclhack.def (winidss_valist): Limit applicability.
* fixinc/inclhack.def (winidss_valist): Limit applicability.
* fixinc/fixincl.x: Regenerated.
* fixinc/tests/base/math.h: Update.
* fixinc/tests/base/testing.h: Likewise.
From-SVN: r53441
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 14 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 1 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/math.h | 10 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/testing.h | 5 |
4 files changed, 27 insertions, 3 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index a7a3ce9..589687f 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -5484,8 +5484,16 @@ tSCC zWindiss_ValistName[] = tSCC* apzWindiss_ValistMachs[] = { "*-*-windiss", (const char*)NULL }; -#define WINDISS_VALIST_TEST_CT 0 -#define aWindiss_ValistTests (tTestDesc*)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zWindiss_ValistSelect0[] = + "(#include.*)diab/va_list.h"; + +#define WINDISS_VALIST_TEST_CT 1 +static tTestDesc aWindiss_ValistTests[] = { + { TT_EGREP, zWindiss_ValistSelect0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Windiss_Valist @@ -5664,7 +5672,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 151 +#define REGEX_COUNT 152 #define MACH_LIST_SIZE_LIMIT 279 #define FIX_COUNT 145 diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 09e6bd7..d5b5eec 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -3337,6 +3337,7 @@ fix = { * WindISS headers include "diab/va_list.h" instead of "stdarg.h" */ fix = { + select = '(#include.*)diab/va_list.h'; hackname = windiss_valist; sed = "s|diab/va_list.h|stdarg.h|"; mach = "*-*-windiss"; diff --git a/gcc/fixinc/tests/base/math.h b/gcc/fixinc/tests/base/math.h index 8cd8c22..4d9907c 100644 --- a/gcc/fixinc/tests/base/math.h +++ b/gcc/fixinc/tests/base/math.h @@ -130,6 +130,16 @@ extern int matherr(); extern double atof(const char *__nptr); #endif /* ULTRIX_ATOF_PARAM_CHECK */ + + +#if defined( WINDISS_MATH1_CHECK ) +#ifndef __GNUC__ +#endif /* WINDISS_MATH1_CHECK */ + + +#if defined( WINDISS_MATH2_CHECK ) +#endif /* __GNUC__ */ +#endif /* WINDISS_MATH2_CHECK */ #ifdef __cplusplus #undef exception #endif diff --git a/gcc/fixinc/tests/base/testing.h b/gcc/fixinc/tests/base/testing.h index d58d611..d2393ad 100644 --- a/gcc/fixinc/tests/base/testing.h +++ b/gcc/fixinc/tests/base/testing.h @@ -121,3 +121,8 @@ extern size_t #endif #endif /* UNDEFINE_NULL_CHECK */ + + +#if defined( WINDISS_VALIST_CHECK ) +#include <stdarg.h> +#endif /* WINDISS_VALIST_CHECK */ |