From a4f0a3bc86436b53221c1ff23370175814f7ddea Mon Sep 17 00:00:00 2001 From: MaartenBrock Date: Wed, 29 Nov 2006 07:31:45 +0000 Subject: [PATCH] * device/include/asm/mcs51/features.h, * device/include/malloc.h, * device/include/stdio.h: changed keywords to double underscore variants, fixes bug 1590261 git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4491 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 7 +++++++ device/include/asm/mcs51/features.h | 20 ++++++++++---------- device/include/malloc.h | 8 ++++---- device/include/stdio.h | 6 +++--- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 902d51c1..a689e635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-28 Maarten Brock + + * device/include/asm/mcs51/features.h, + * device/include/malloc.h, + * device/include/stdio.h: changed keywords to double underscore variants, + fixes bug 1590261 + 2006-11-27 Borut Razem * support\cpp2\cppexp.c, support\cpp2\hashtable.h, diff --git a/device/include/asm/mcs51/features.h b/device/include/asm/mcs51/features.h index 4ab384d8..83c1659e 100644 --- a/device/include/asm/mcs51/features.h +++ b/device/include/asm/mcs51/features.h @@ -3,8 +3,8 @@ #ifndef __SDC51_ASM_MCS51_FEATURES_H #define __SDC51_ASM_MCS51_FEATURES_H 1 -#define _REENTRANT reentrant -#define _CODE code +#define _REENTRANT __reentrant +#define _CODE __code /* define _AUTOMEM to indicate the default storage class for automatic variables. To be used with pointers to automatic variables. @@ -18,16 +18,16 @@ */ #if defined(SDCC_STACK_AUTO) #if defined(SDCC_USE_XSTACK) - #define _AUTOMEM pdata + #define _AUTOMEM __pdata #else - #define _AUTOMEM idata + #define _AUTOMEM __idata #endif #elif defined(SDCC_MODEL_SMALL) - #define _AUTOMEM data + #define _AUTOMEM __data #elif defined(SDCC_MODEL_MEDIUM) - #define _AUTOMEM pdata + #define _AUTOMEM __pdata #else - #define _AUTOMEM xdata + #define _AUTOMEM __xdata #endif /* define _STATMEM to indicate the default storage class for @@ -40,11 +40,11 @@ } */ #if defined(SDCC_MODEL_SMALL) - #define _STATMEM data + #define _STATMEM __data #elif defined(SDCC_MODEL_MEDIUM) - #define _STATMEM pdata + #define _STATMEM __pdata #else - #define _STATMEM xdata + #define _STATMEM __xdata #endif #endif diff --git a/device/include/malloc.h b/device/include/malloc.h index 9be8cec5..fcaca83f 100644 --- a/device/include/malloc.h +++ b/device/include/malloc.h @@ -36,10 +36,10 @@ void free (void * ptr); #else -extern void init_dynamic_memory(void xdata * heap, unsigned int size); -extern void xdata * calloc (size_t nmemb, size_t size); -extern void xdata * malloc (size_t size); -extern void xdata * realloc (void * ptr, size_t size); +extern void init_dynamic_memory(void __xdata * heap, unsigned int size); +extern void __xdata * calloc (size_t nmemb, size_t size); +extern void __xdata * malloc (size_t size); +extern void __xdata * realloc (void * ptr, size_t size); extern void free (void * ptr); #endif diff --git a/device/include/stdio.h b/device/include/stdio.h index d02c5eb1..3f24931c 100644 --- a/device/include/stdio.h +++ b/device/include/stdio.h @@ -59,9 +59,9 @@ extern char getchar(void); extern void putchar(char); #if defined(SDCC_mcs51) && !defined(SDCC_USE_XSTACK) -extern void printf_fast(code char *fmt, ...) _REENTRANT; -extern void printf_fast_f(code char *fmt, ...) _REENTRANT; -extern void printf_tiny(code char *fmt, ...) _REENTRANT; +extern void printf_fast(__code char *fmt, ...) _REENTRANT; +extern void printf_fast_f(__code char *fmt, ...) _REENTRANT; +extern void printf_tiny(__code char *fmt, ...) _REENTRANT; #endif #endif /* __SDC51_STDIO_H */ -- 2.30.2