diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-07-07 11:19:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-07-07 11:19:23 +1000 |
| commit | 85fe4a96728b8f53cfa16068675e819f7cdc3162 (patch) | |
| tree | acca0993d1c2fc85fb615ad651569db533b99f50 /src/gos/sys_rules.h | |
| parent | a675812b08fa9b86c841762441b4ed4060ff4aa0 (diff) | |
| parent | efe79a4a310cd9c02dae1eab014346d6092a0d44 (diff) | |
| download | uGFX-85fe4a96728b8f53cfa16068675e819f7cdc3162.tar.gz uGFX-85fe4a96728b8f53cfa16068675e819f7cdc3162.tar.bz2 uGFX-85fe4a96728b8f53cfa16068675e819f7cdc3162.zip | |
Merge branch 'eCos'
Diffstat (limited to 'src/gos/sys_rules.h')
| -rw-r--r-- | src/gos/sys_rules.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gos/sys_rules.h b/src/gos/sys_rules.h index f23d330b..0da01ff2 100644 --- a/src/gos/sys_rules.h +++ b/src/gos/sys_rules.h @@ -16,7 +16,7 @@ #ifndef _GOS_RULES_H #define _GOS_RULES_H -#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 +#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 #if GFX_DISPLAY_RULE_WARNINGS #warning "GOS: No Operating System has been defined. ChibiOS (GFX_USE_OS_CHIBIOS) has been turned on for you." #endif @@ -24,7 +24,7 @@ #define GFX_USE_OS_CHIBIOS TRUE #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 != 1 * 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 != 1 * TRUE #error "GOS: More than one operation system has been defined as TRUE." #endif |