diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-02-27 17:44:21 +1000 |
| commit | f265924396167729e8d9fb36a0383263f36c1270 (patch) | |
| tree | 28843eb24b18999cf0217ecb0fe935f133901066 /src/gos/gos_rules.h | |
| parent | 14786e97b618b8bc2a0ff1c732d45288fe550e33 (diff) | |
| download | uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.gz uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.bz2 uGFX-f265924396167729e8d9fb36a0383263f36c1270.zip | |
First set of V3 macro changes
Diffstat (limited to 'src/gos/gos_rules.h')
| -rw-r--r-- | src/gos/gos_rules.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h index 2ea1b1b2..96b4b795 100644 --- a/src/gos/gos_rules.h +++ b/src/gos/gos_rules.h @@ -20,8 +20,8 @@ #error "GOS: No operating system has been defined." #endif -#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * TRUE - #error "GOS: More than one operation system has been defined as TRUE." +#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * GFXON + #error "GOS: More than one operation system has been defined as GFXON." #endif #if GFX_FREERTOS_USE_TRACE && !GFX_USE_OS_FREERTOS @@ -43,7 +43,7 @@ #endif #endif #undef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif #endif |