diff options
| author | Joel Bodenmann <info@b-electronics.ch> | 2016-05-22 19:22:23 +0200 |
|---|---|---|
| committer | Joel Bodenmann <info@b-electronics.ch> | 2016-05-22 19:22:23 +0200 |
| commit | 08c639ecf6e1726748ccc9c34b84c68e778ce0ac (patch) | |
| tree | 798525821e60db3e8f25f1a800116861d4dd71d8 | |
| parent | 238e19d77f2c8add083e8b5582664881f621c016 (diff) | |
| parent | c82efc428f1418a2569e218cffb6023d4c0a03a9 (diff) | |
| download | uGFX-08c639ecf6e1726748ccc9c34b84c68e778ce0ac.tar.gz uGFX-08c639ecf6e1726748ccc9c34b84c68e778ce0ac.tar.bz2 uGFX-08c639ecf6e1726748ccc9c34b84c68e778ce0ac.zip | |
Merged in kimballjohnson/ugfx/kimballjohnson/fix-preprocessor-elif-gfx_cpu-duplicate-1463933248092 (pull request #21)
Fix preprocessor elif, GFX_CPU == duplicated
| -rw-r--r-- | src/gos/gos_x_threads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index fa084d8e..4fc66588 100644 --- a/src/gos/gos_x_threads.c +++ b/src/gos/gos_x_threads.c @@ -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. |