From: bernie Date: Sat, 8 Jan 2005 08:49:39 +0000 (+0000) Subject: Define PROGMEM on AVR only when not including pgmspace.h. X-Git-Tag: 1.0.0~911 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2eaa97408148a89f59b3ee75a0c43907b9e5fc75;p=bertos.git Define PROGMEM on AVR only when not including pgmspace.h. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@330 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/compiler.h b/compiler.h index 3eb3f6a6..729888c2 100755 --- a/compiler.h +++ b/compiler.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.39 2005/01/08 08:49:39 bernie + *#* Define PROGMEM on AVR only when not including pgmspace.h. + *#* *#* Revision 1.38 2004/12/31 16:41:52 bernie *#* PROGMEM: Define to nothing for non-Harvard processors. *#* @@ -248,8 +251,10 @@ #define PGM_READ_CHAR(s) pgm_read_byte(s) #define PGM_FUNC(x) x ## _P #define PGM_ATTR PROGMEM + #else + /* We still need this for prototypes */ + #define PROGMEM __attribute__((__progmem__)) #endif - #define PROGMEM __attribute__((__progmem__)) #endif