From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 26 Nov 2006 18:21:29 +0000 (+0000)
Subject: * support/cpp2/sdcc.h: x*alloc macro redefinition
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c175b6c035b3aa0fd2ef6e08bfea00fa4ef3df39;p=fw%2Fsdcc

* support/cpp2/sdcc.h: x*alloc macro redefinition

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4487 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 699dda8f..b1a62f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
-2006-11-25 Borut Razem <borut.razem AT siol.net>
+2006-11-26 Borut Razem <borut.razem AT siol.net>
 
 	* support/cpp2/libiberty.h: commented out x*alloc() declarations
 	  since they are redefined by macros in support/cpp2/sdcc.h
+	* support/cpp2/sdcc.h: x*alloc macro redefinition
 
 2006-11-25 Borut Razem <borut.razem AT siol.net>
 
diff --git a/support/cpp2/sdcc.h b/support/cpp2/sdcc.h
index 2083f1a4..ec18269d 100644
--- a/support/cpp2/sdcc.h
+++ b/support/cpp2/sdcc.h
@@ -1,11 +1,15 @@
 /* Various stuff needed to hack the build for SDCC. */
-#define xmalloc(s) malloc(s)
-#define xstrdup(s) strdup(s)
-#define xrealloc(p,s) realloc(p,s)
-#define xcalloc(n,e) calloc(n,e)
+#define xmalloc   malloc
+#define xstrdup   strdup
+#define xrealloc  realloc
+#define xcalloc   calloc
+
+#define xstrerror strerror
 #define xmalloc_set_program_name(n) /* nada */
-#define xstrerror(e) strerror(e)
 
+/*
+ * From defaults.h
+ */
 /* Define results of standard character escape sequences.  */
 #define TARGET_BELL	007
 #define TARGET_BS	010
@@ -14,7 +18,7 @@
 #define TARGET_VT	013
 #define TARGET_FF	014
 #define TARGET_CR	015
-#  define TARGET_ESC 033
+#define TARGET_ESC	033
 
 #define CHAR_TYPE_SIZE 8
 #define WCHAR_TYPE_SIZE 32	/* ? maybe ? */