diff options
| author | Bruce Korb <korbb@gcc.gnu.org> | 2001-07-21 04:04:27 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2001-07-21 04:04:27 +0000 |
| commit | 907cb30e6ec4e77c19cbe64bd370cee4956ad29c (patch) | |
| tree | e7b96df12f1d6745771f9bf4e6f08cfda4269f5a | |
| parent | e9644cfea18acae1d77d30b608bde9f5c5f6e602 (diff) | |
| download | gcc-907cb30e6ec4e77c19cbe64bd370cee4956ad29c.zip gcc-907cb30e6ec4e77c19cbe64bd370cee4956ad29c.tar.gz gcc-907cb30e6ec4e77c19cbe64bd370cee4956ad29c.tar.bz2 | |
incorporate patches from 3.0 branch
From-SVN: r44218
| -rw-r--r-- | gcc/fixinc/inclhack.def | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 21e8366..aedf097 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -121,7 +121,7 @@ fix = { /* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */ /************************************************************************/ -/* +/*" " ** This file is a DG internal header. Never include this ** file directly. */ @@ -1154,7 +1154,7 @@ fix = { */ fix = { hackname = hpux10_cpp_pow_inline; - files = math.h; + files = fixinc-test-limits.h, math.h; select = <<- END_POW_INLINE ^# +ifdef +__cplusplus +} @@ -2091,23 +2091,23 @@ fix = { * initializer to "{0}" instead */ fix = { - hackname = solaris_mutex_init; - select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; - files = pthread.h; - c_fix = format; - c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n" - "%0\n" - "#else\n" - "%1, {0}}%3\n" - "#endif"; - c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*)" - ",[ \t]*0}" "(|[ \t].*)$"; - test_text = - '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n" - "#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n" - "#define PTHREAD_COND_INITIALIZER\t{{{0}, 0}, 0}\t/* DEFAULTCV */\n" - "#define PTHREAD_RWLOCK_INITIALIZER\t" - "{0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}}"; + hackname = solaris_mutex_init; + select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI"; + files = pthread.h; + c_fix = format; + c_fix_arg = "#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)\n" + "%0\n" + "#else\n" + "%1, {0}}%3\n" + "#endif"; + c_fix_arg = "(^#define[ \t]+PTHREAD_(MUTEX|COND)_INITIALIZER[ \t]+{.*)" + ",[ \t]*0}" "(|[ \t].*)$"; + test_text = + '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n" + "#define PTHREAD_MUTEX_INITIALIZER\t{{{0},0}, {{{0}}}, 0}\n" + "#define PTHREAD_COND_INITIALIZER\t{{{0}, 0}, 0}\t/* DEFAULTCV */\n" + "#define PTHREAD_RWLOCK_INITIALIZER\t" + "{0, 0, 0, {0, 0, 0}, {0, 0}, {0, 0}}"; }; |