aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-07-23 18:52:52 +0200
committerJoel Bodenmann <joel@unormal.org>2013-07-23 18:52:52 +0200
commitea3048ff3675ba460b1ca47798340d227fefc05e (patch)
treecb7d8b1590990a93ee56b959002f41f3b5e6e215 /src
parent95b15971584cbfdad533411bcb8d8cec82e996fa (diff)
downloaduGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.tar.gz
uGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.tar.bz2
uGFX-ea3048ff3675ba460b1ca47798340d227fefc05e.zip
fixed OS-X port (untested)
Diffstat (limited to 'src')
-rw-r--r--src/gdisp/image.c2
-rw-r--r--src/gwin/gimage.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/image.c b/src/gdisp/image.c
index 2e56d068..aba8fe6c 100644
--- a/src/gdisp/image.c
+++ b/src/gdisp/image.c
@@ -117,7 +117,7 @@ bool_t gdispImageSetMemoryReader(gdispImage *img, const void *memimage) {
}
#endif
-#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX
+#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX
#include <stdio.h>
static size_t ImageFileRead(struct gdispImageIO *pio, void *buf, size_t len) {
diff --git a/src/gwin/gimage.c b/src/gwin/gimage.c
index 64376b4b..35ca1c6d 100644
--- a/src/gwin/gimage.c
+++ b/src/gwin/gimage.c
@@ -159,7 +159,7 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory) {
return TRUE;
}
-#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__)
bool_t gwinImageOpenFile(GHandle gh, const char* filename) {
if (gdispImageIsOpen(&widget(gh)->image))
gdispImageClose(&widget(gh)->image);