diff options
| author | inmarket <inmarket@ugfx.io> | 2017-06-30 19:43:51 +1000 |
|---|---|---|
| committer | inmarket <inmarket@ugfx.io> | 2017-06-30 19:43:51 +1000 |
| commit | 9b7318710025ae85af714bb0b5f390db84ae2cd0 (patch) | |
| tree | f7b1849a40c0019d048761f9493f6d15695703cd /src/gos/gos_rules.h | |
| parent | e5497f2ac058acb427b6fcdd15db6adeddd7bc55 (diff) | |
| download | uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.gz uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.bz2 uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.zip | |
Add compatibility with Visual Studio and make compile warning capabilities more cross platform
Diffstat (limited to 'src/gos/gos_rules.h')
| -rw-r--r-- | src/gos/gos_rules.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h index b4b8e445..6779045d 100644 --- a/src/gos/gos_rules.h +++ b/src/gos/gos_rules.h @@ -32,7 +32,11 @@ #if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || GFX_USE_OS_ECOS || \ (GFX_OS_HEAP_SIZE == 0 && (GFX_USE_OS_RAW32 || GFX_USE_OS_ARDUINO || GFX_USE_OS_CMSIS || GFX_USE_OS_KEIL)) #if GFX_DISPLAY_RULE_WARNINGS - #warning "GOS: Cannot emulate malloc as gfxAlloc() internally uses malloc on this platform" + #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT + #warning "GOS: Cannot emulate malloc as gfxAlloc() internally uses malloc on this platform" + #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO + COMPILER_WARNING("GOS: Cannot emulate malloc as gfxAlloc() internally uses malloc on this platform") + #endif #endif #undef GFX_EMULATE_MALLOC #define GFX_EMULATE_MALLOC FALSE |