From c58267e765da5b700374b35797ff11b42d874fe7 Mon Sep 17 00:00:00 2001 From: MaartenBrock Date: Sat, 24 Mar 2007 19:22:56 +0000 Subject: [PATCH] * device/include/assert.h: applied patch 1686533 to fix bug 1686528, thanks Alexey Shamrin , made assert.h header ANSI compliant (added a check for NDEBUG macro, removed header guard) * .version, * sdcc.spec: bumped version to 2.6.5 git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4711 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- .version | 2 +- ChangeLog | 6 ++++++ device/include/assert.h | 20 +++++++++++++------- sdcc.spec | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.version b/.version index 2714f531..57cf282e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.6.4 +2.6.5 diff --git a/ChangeLog b/ChangeLog index 5e0b0478..f95d560d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ (saveRBank, unsaveRBank): don't save bits, (genFunction, genEndFunction): save bits exactly once, fix bug 1535242 * support/regression/tests/bug1535242.c: new, added + * device/include/assert.h: applied patch 1686533 to fix bug 1686528, + thanks Alexey Shamrin , + made assert.h header ANSI compliant (added a check for NDEBUG macro, + removed header guard) + * .version, + * sdcc.spec: bumped version to 2.6.5 2007-03-22 Borut Razem diff --git a/device/include/assert.h b/device/include/assert.h index eed3ff40..419a070b 100644 --- a/device/include/assert.h +++ b/device/include/assert.h @@ -7,26 +7,32 @@ under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program 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 General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve - what you give them. Help stamp out software-hoarding! + what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ -#ifndef SDCC_ASSERT_H -#define SDCC_ASSERT_H +#undef assert + +#ifdef NDEBUG +/* Debugging disabled -- do not evaluate assertions. */ +#define assert(x) ((void)0) + +#else + +/* Debugging enabled -- verify assertions at run time. */ void _assert(char *, const char *, unsigned int); #define assert(x) ((x) == 0 ? _assert(#x, __FILE__, __LINE__):(void)0) - #endif diff --git a/sdcc.spec b/sdcc.spec index 150a8e6b..f050a81f 100644 --- a/sdcc.spec +++ b/sdcc.spec @@ -8,7 +8,7 @@ License: GPL Group: Applications/Engineering Summary: Small Device C Compiler Requires: sdcc-common -Version: 2.6.4 +Version: 2.6.5 Release: 2 Source: %{name}-src-%{version}.tar.gz URL: http://sdcc.sourceforge.net/ -- 2.30.2