* device/include/assert.h: applied patch 1686533 to fix bug 1686528,

  thanks Alexey Shamrin <shamrin AT gmail.com>,
  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

diff --git a/.version b/.version
index 2714f5313ae11cebf3c524b8b58ca47df56e5deb..57cf282ebbc41ec4cd51601733bc26d60c2341d4 100644 (file)
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.6.4
+2.6.5

diff --git a/ChangeLog b/ChangeLog
index 5e0b04783b7235b14896bc52b41ee20cbd1059be..f95d560da4b70f72fdb5eafd7dd76d9ba78c1ce1 100644 (file)
--- 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 <shamrin AT gmail.com>,
+         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 <borut.razem AT siol.net>
 

diff --git a/device/include/assert.h b/device/include/assert.h
index eed3ff40b5a95105e15f578fdf042873c69f870a..419a070b804c2afeb80136ac6b847bf41b2dda9a 100644 (file)
--- 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 150a8e6be2c107c8d889032bd611b97d562b6557..f050a81f66350ea15c3c115088b33f4f8ef0420b 100644 (file)
--- 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/