From 1fbbc4d52bed0b8e4f3289bc008b3f0928a6b24f Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 27 Jul 2013 22:25:20 +1000 Subject: [PATCH] Integrate changes from master branch --- demos/modules/gwin/widgets/gfxconf.h | 2 +- include/gos/osx.h | 1 - 2 files changed, 1 insertion(+), 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)