djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/nlrx86,x64: Replace #define of defined() with portable macro usage. 

Using gcc -Wpedantic will warn that #define of defined() is non-portable
and this patch fixes this.
This commit is contained in:
Damien George 2017-08-29 12:52:18 +10:00
parent 613510bce8
commit be8e5744e6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/nlrx64.c
View File

@ -34,7 +34,11 @@
// x86-64 callee-save registers are: // x86-64 callee-save registers are:
// rbx, rbp, rsp, r12, r13, r14, r15 // rbx, rbp, rsp, r12, r13, r14, r15
#define NLR_OS_WINDOWS (defined(_WIN32) || defined(__CYGWIN__)) #if defined(_WIN32) || defined(__CYGWIN__)
#define NLR_OS_WINDOWS 1
#else
#define NLR_OS_WINDOWS 0
#endif
__attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr); __attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr);

6
py/nlrx86.c
View File

@ -35,7 +35,11 @@
// For reference, x86 callee save regs are: // For reference, x86 callee save regs are:
// ebx, esi, edi, ebp, esp, eip // ebx, esi, edi, ebp, esp, eip
#define NLR_OS_WINDOWS (defined(_WIN32) || defined(__CYGWIN__)) #if defined(_WIN32) || defined(__CYGWIN__)
#define NLR_OS_WINDOWS 1
#else
#define NLR_OS_WINDOWS 0
#endif
#if NLR_OS_WINDOWS #if NLR_OS_WINDOWS
unsigned int nlr_push_tail(nlr_buf_t *nlr) asm("nlr_push_tail"); unsigned int nlr_push_tail(nlr_buf_t *nlr) asm("nlr_push_tail");