Merged in kimballjohnson/ugfx/kimballjohnson/fix-preprocessor-elif-gfx_cpu-duplicate-1463933248092 (pull request #21)

Fix preprocessor elif, GFX_CPU == duplicated
ugfx_release_2.6
Joel Bodenmann 2016-05-22 19:22:23 +02:00
commit 08c639ecf6
1 changed files with 1 additions and 1 deletions

View File

@ -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.