From eee58a59c8b9e732b0248e08e023b69c3ea41b16 Mon Sep 17 00:00:00 2001 From: borutr Date: Sun, 16 Dec 2007 11:59:54 +0000 Subject: [PATCH] * device/include/pic16/stdbool.h: removed, since already exists in device/include/; this also fixes bitopcse.c regression test for pic16 target * support/regression/fwk/inclusw/testfwk.h: added macro ASSERT_FAILED git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4977 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 7 +++++ device/include/pic16/stdbool.h | 39 ------------------------ support/regression/fwk/include/testfwk.h | 3 +- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 device/include/pic16/stdbool.h diff --git a/ChangeLog b/ChangeLog index bdf76460..1cbe192a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-16 Borut Razem + + * device/include/pic16/stdbool.h: removed, since already exists in + device/include/; this also fixes bitopcse.c regression test for pic16 + target + * support/regression/fwk/inclusw/testfwk.h: added macro ASSERT_FAILED + 2007-12-05 Borut Razem * doc/sdccman.lyx: fixed bug #1844509 - Correction to Manual 4.6.9 diff --git a/device/include/pic16/stdbool.h b/device/include/pic16/stdbool.h deleted file mode 100644 index 500af9b2..00000000 --- a/device/include/pic16/stdbool.h +++ /dev/null @@ -1,39 +0,0 @@ -/*------------------------------------------------------------------------- - stdbool.h - ANSI functions forward declarations - - Ported to PIC16 port by Raphael Neider (2005) - - Written By - Maarten Brock, sourceforge.brock@dse.nl (2004) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --------------------------------------------------------------------------*/ - -/* -** $Id$ -*/ - -#ifndef __PIC16_STDBOOL_H -#define __PIC16_STDBOOL_H 1 - -#define _Bool unsigned char - -#define bool _Bool -#define true 1 -#define false 0 -#define __bool_true_false_are_defined 1 - -#define BOOL unsigned char - -#endif /* __PIC16_STDBOOL_H */ diff --git a/support/regression/fwk/include/testfwk.h b/support/regression/fwk/include/testfwk.h index 36a9df09..d5c7d9c2 100644 --- a/support/regression/fwk/include/testfwk.h +++ b/support/regression/fwk/include/testfwk.h @@ -38,7 +38,8 @@ void __printn(int n); code const char *__getSuiteName(void); void __runSuite(void); -#define ASSERT(_a) (__numTests++, (_a) ? (void)0 : __fail("Assertion failed", #_a, __FILE__, __LINE__)) +#define ASSERT(_a) (++__numTests, (_a) ? (void)0 : __fail("Assertion failed", #_a, __FILE__, __LINE__)) +#define ASSERT_FAILS(_a) (__numTests++, (_a) ? 0 : (__fail("Assertion failed", #_a, __FILE__, __LINE__), 1)) #define FAIL() FAILM("Failure") #define FAILM(_a) __fail(_a, #_a, __FILE__, __LINE__) -- 2.30.2