diff options
author | Joel Bodenmann <joel@unormal.org> | 2013-07-23 18:52:52 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2013-07-23 18:52:52 +0200 |
commit | ea3048ff3675ba460b1ca47798340d227fefc05e (patch) | |
tree | cb7d8b1590990a93ee56b959002f41f3b5e6e215 /include | |
parent | 95b15971584cbfdad533411bcb8d8cec82e996fa (diff) | |
download | uGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.tar.gz uGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.tar.bz2 uGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.zip |
fixed OS-X port (untested)
Diffstat (limited to 'include')
-rw-r--r-- | include/gdisp/image.h | 2 | ||||
-rw-r--r-- | include/gos/chibios.h | 2 | ||||
-rw-r--r-- | include/gos/osx.h | 2 | ||||
-rw-r--r-- | include/gwin/image.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/gdisp/image.h b/include/gdisp/image.h index 32100dc9..8619cb9c 100644 --- a/include/gdisp/image.h +++ b/include/gdisp/image.h @@ -143,7 +143,7 @@ extern "C" { bool_t gdispImageSetBaseFileStreamReader(gdispImage *img, void *BaseFileStreamPtr); #endif - #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__) + #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__) /** * @brief Sets the io fields in the image structure to routines * that support reading from an image stored in Win32 simulators native diff --git a/include/gos/chibios.h b/include/gos/chibios.h index 14ba4b2e..aa98c645 100644 --- a/include/gos/chibios.h +++ b/include/gos/chibios.h @@ -6,7 +6,7 @@ */ /** - * @file include/gos/posix.h + * @file include/gos/chibios.h * @brief GOS - Operating System Support header file for ChibiOS. */ diff --git a/include/gos/osx.h b/include/gos/osx.h index a181c2c6..fde1d005 100644 --- a/include/gos/osx.h +++ b/include/gos/osx.h @@ -7,7 +7,7 @@ /** * @file include/gos/osx.h - * @brief GOS - Operating System Support header file for POSIX. + * @brief GOS - Operating System Support header file for Mac OS-X. */ #ifndef _GOS_OSX_H diff --git a/include/gwin/image.h b/include/gwin/image.h index 00b6bf30..eae196e9 100644 --- a/include/gwin/image.h +++ b/include/gwin/image.h @@ -69,7 +69,7 @@ GHandle gwinImageCreate(GImageObject *widget, GWindowInit *pInit); */ bool_t gwinImageOpenMemory(GHandle gh, const void* memory); -#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__) +#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__) /** * @brief Sets the input routines that support reading the image from a file * @return TRUE if the IO open function succeeds |