diff options
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/check.tpl | 2 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 2 | ||||
| -rw-r--r-- | gcc/fixinc/tests/base/assert.h | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/fixinc/check.tpl b/gcc/fixinc/check.tpl index fd03b3ea609..a241d18d0e8 100644 --- a/gcc/fixinc/check.tpl +++ b/gcc/fixinc/check.tpl @@ -171,6 +171,6 @@ else fi $exitok[= -(set-writable) +(if (defined? 'set-writable) (set-writable)) =] diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 0f1a2107649..764f621f885 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2089,7 +2089,7 @@ fix = { select = '__cplusplus < 54321L'; sed = 's/defined(__cplusplus) && (__cplusplus < 54321L)/0/'; - test_text = '#if\tdefined(__cplusplus) && (__cplusplus < 54321L)'; + test_text = "#if\tdefined(__cplusplus) && (__cplusplus < 54321L)"; }; /* diff --git a/gcc/fixinc/tests/base/assert.h b/gcc/fixinc/tests/base/assert.h index 45716a3b303..5140e892e3c 100644 --- a/gcc/fixinc/tests/base/assert.h +++ b/gcc/fixinc/tests/base/assert.h @@ -24,6 +24,11 @@ extern void __assert(const char *, const char *, int); #endif /* ALPHA___ASSERT_CHECK */ +#if defined( ALPHA_ASSERT_CHECK ) +#define assert(EX) ((EX) ? (void)0 : __assert(#EX, __FILE__, __LINE__)) +#endif /* ALPHA_ASSERT_CHECK */ + + #if defined( BROKEN_ASSERT_STDIO_CHECK ) extern FILE* stderr; #endif /* BROKEN_ASSERT_STDIO_CHECK */ |
