From 62eb9d8a9c4a374ed14fe484ea7a0fa833a15549 Mon Sep 17 00:00:00 2001 From: borutr Date: Sun, 21 Dec 2008 13:47:21 +0000 Subject: [PATCH] * support/librarian/sdcclib.c: fixed build failure on Mac OS X due to redifinition of symbol __assert sdcclib.c:53:1:warning: "__assert" redefined /Xcode2.5/SDKs/MacOSX10.4u.sdk/usr/include/assert.h:80:1: warning: this is the location of the previous definition git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5294 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 8 ++++++++ support/librarian/sdcclib.c | 11 +++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9afc3e2b..76803dbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-21 Borut Razem + + * support/librarian/sdcclib.c: fixed build failure on Mac OS X + due to redifinition of symbol __assert + sdcclib.c:53:1:warning: "__assert" redefined + /Xcode2.5/SDKs/MacOSX10.4u.sdk/usr/include/assert.h:80:1: + warning: this is the location of the previous definition + 2008-12-20 Raphael Neider * debugger/mcs51/break.c, debugger/mcs51/cmd.c, diff --git a/support/librarian/sdcclib.c b/support/librarian/sdcclib.c index 9367f8f3..7b8c1f06 100644 --- a/support/librarian/sdcclib.c +++ b/support/librarian/sdcclib.c @@ -49,22 +49,17 @@ int NumRelFiles=0; #define NEQ(A,B) strcmp((A),(B)) #if 1 -#include -#define __assert(COND) do { assert(COND); } while (0) -#else -#define __assert(COND) do { (void)(COND); } while (0) -#endif - #define fgets(S, SIZE, STREAM) do { \ char *__s4567 = S; \ char *__res4567 = fgets(__s4567, SIZE, STREAM); \ - __assert(__s4567 == __res4567); \ + assert(__s4567 == __res4567); \ } while (0) #define system(CMD) do { \ int __res4568 = system(CMD); \ - __assert(-1 != __res4568); \ + assert(-1 != __res4568); \ } while (0) +#endif int action=OPT_NONE; FILE *lib, *newlib, *rel, *adb, *libindex; -- 2.30.2