diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-07-27 22:25:20 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-07-27 22:25:20 +1000 |
| commit | 1fbbc4d52bed0b8e4f3289bc008b3f0928a6b24f (patch) | |
| tree | ecbe67a96e3c84da8b50c1817918d791078d7480 | |
| parent | 9dfcbef84884f67bb487dc02c642a03ca5d19e32 (diff) | |
| download | uGFX-1fbbc4d52bed0b8e4f3289bc008b3f0928a6b24f.tar.gz uGFX-1fbbc4d52bed0b8e4f3289bc008b3f0928a6b24f.tar.bz2 uGFX-1fbbc4d52bed0b8e4f3289bc008b3f0928a6b24f.zip | |
Integrate changes from master branch
| -rw-r--r-- | demos/modules/gwin/widgets/gfxconf.h | 2 | ||||
| -rw-r--r-- | include/gos/osx.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index fffe685d..f8d8fe5f 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -29,7 +29,7 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_CHIBIOS TRUE //#define GFX_USE_OS_WIN32 TRUE //#define GFX_USE_OS_POSIX TRUE diff --git a/include/gos/osx.h b/include/gos/osx.h index 2ba1c45d..3f36aaff 100644 --- a/include/gos/osx.h +++ b/include/gos/osx.h @@ -48,7 +48,6 @@ typedef pthread_mutex_t gfxMutex; #define gfxSemSignalI(psem) gfxSemSignal(psem) #define gfxSemCounterI(pSem) ((pSem)->cnt) -#define TRUE 1 #define TIME_IMMEDIATE 0 #define TIME_INFINITE ((delaytime_t)-1) #define MAX_SEMAPHORE_COUNT ((semcount_t)-1) |