Integrate changes from master branch

ugfx_release_2.6
inmarket 2013-07-27 22:25:20 +10:00
parent 9dfcbef848
commit 1fbbc4d52b
2 changed files with 1 additions and 2 deletions

View File

@ -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

View File

@ -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)