Skip to content

Commit 9a0f1d0

Browse files
Earle F. Philhower, IIIEarle F. Philhower, III
Earle F. Philhower, III
authored and
Earle F. Philhower, III
committed
Fix merge define conflict in c_types.h
1 parent 9e5b343 commit 9a0f1d0

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

tools/sdk/include/c_types.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,9 @@ typedef enum {
8888
#define __ICACHE_STRINGIZE(A) __ICACHE_STRINGIZE_NX(A)
8989
#define ICACHE_FLASH_ATTR __attribute__((section("\".irom0.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
9090
#define ICACHE_RAM_ATTR __attribute__((section("\".iram.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
91-
#define ICACHE_RODATA_ATTR __attribute__((section("\".irom.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
9291
#else
9392
#define ICACHE_FLASH_ATTR
9493
#define ICACHE_RAM_ATTR
95-
#define ICACHE_RODATA_ATTR
9694
#endif /* ICACHE_FLASH */
9795

9896
#define STORE_ATTR __attribute__((aligned(4)))

0 commit comments

Comments
 (0)