Skip to content

Commit

Permalink
Merged in kimballjohnson/ugfx/kimballjohnson/fix-preprocessor-elif-gf…
Browse files Browse the repository at this point in the history
…x_cpu-duplicate-1463933248092 (pull request qmk#21)

Fix preprocessor elif, GFX_CPU == duplicated
Joel Bodenmann committed May 22, 2016
2 parents 238e19d + c82efc4 commit 08c639e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/gos/gos_x_threads.c
Original file line number Diff line number Diff line change
@@ -265,7 +265,7 @@ static thread mainthread; // The main thread context
gfxThreadExit(current->fn(current->param));
}

#elif GFX_CPU == GFX_CPU == GFX_CPU_CORTEX_M4_FP || GFX_CPU == GFX_CPU_CORTEX_M7_FP
#elif GFX_CPU == GFX_CPU_CORTEX_M4_FP || GFX_CPU == GFX_CPU_CORTEX_M7_FP

// Use the EABI calling standard (ARM's AAPCS) - Save r4 - r11 and floating point
// The context is saved at the current stack location and a pointer is maintained in the thread structure.

0 comments on commit 08c639e

Please sign in to comment.