diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2018-06-12 16:58:24 +0200 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2018-06-12 08:58:24 -0600 |
| commit | c649ee40c37020bd836a6f91c5b4853bb8a6a07c (patch) | |
| tree | d2de50033f728c1e9ae5963481be1fcf3949145b /fixincludes/inclhack.def | |
| parent | 9f51da538376188b7ad282ab38d704eed871bd4e (diff) | |
| download | gcc-c649ee40c37020bd836a6f91c5b4853bb8a6a07c.zip gcc-c649ee40c37020bd836a6f91c5b4853bb8a6a07c.tar.gz gcc-c649ee40c37020bd836a6f91c5b4853bb8a6a07c.tar.bz2 | |
inclhack.def: Fix fixup for assert.h on vxworks.
* inclhack.def: Fix fixup for assert.h on vxworks.
* fixincl.x: Regenerate.
From-SVN: r261499
Diffstat (limited to 'fixincludes/inclhack.def')
| -rw-r--r-- | fixincludes/inclhack.def | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 5ec5a50..c1f5a13 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -377,11 +377,15 @@ fix = { mach = "*-*-vxworks*"; replace = <<- _EndOfHeader_ - #ifndef _ASSERT_H + #ifdef _ASSERT_H + #undef _ASSERT_H + #undef assert + #endif + #define _ASSERT_H - #ifdef assert - #undef assert + #ifdef __cplusplus + extern "C" { #endif #if defined(__STDC__) || defined(__cplusplus) @@ -399,11 +403,13 @@ fix = { #define assert(test) ((void) \ ((test) ? ((void)0) : \ - __assert("Assertion failed: " ASSERT_STRINGIFY(test) ", file " \ + __assert("Assertion failed: " #test ", file " \ __FILE__ ", line " ASSERT_STRINGIFY(__LINE__) "\n"))) #endif + #ifdef __cplusplus + } #endif _EndOfHeader_; }; |