mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmod/re1.5: Fix compilecode.c compile problem on IAR tool chain. 

The 2nd and 3rd args of the ternary operator are treated like they are in
the same expression and must have similar types.  void is not compatible
with int so that's why the compiler is complaining.
This commit is contained in:
armink 2018-03-21 10:21:29 +08:00 committed by Damien George
parent cf31d384f1
commit 6a693db71d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extmod/re1.5/compilecode.c
View File

@ -5,9 +5,9 @@
#include "re1.5.h" #include "re1.5.h"
#define INSERT_CODE(at, num, pc) \ #define INSERT_CODE(at, num, pc) \
((code ? memmove(code + at + num, code + at, pc - at) : (void)0), pc += num) ((code ? memmove(code + at + num, code + at, pc - at) : 0), pc += num)
#define REL(at, to) (to - at - 2) #define REL(at, to) (to - at - 2)
#define EMIT(at, byte) (code ? (code[at] = byte) : (void)(at)) #define EMIT(at, byte) (code ? (code[at] = byte) : (at))
#define PC (prog->bytelen) #define PC (prog->bytelen)
static const char *_compilecode(const char *re, ByteProg *prog, int sizecode) static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)