diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fa90b9dc32..25fc172430 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-09 14:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbpp.h + ! changed the NOT operator precedence - it should be bigger then + logical .and./.or. operators in #if expressions + + * harbour/source/vm/thread.c + ! fixed typo HB_OS_WIM -> HB_OS_WIN - thanks to Francesco. + 2009-03-09 00:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h * harbour/source/vm/thread.c diff --git a/harbour/include/hbpp.h b/harbour/include/hbpp.h index fa2216d3b7..bc6b605d96 100644 --- a/harbour/include/hbpp.h +++ b/harbour/include/hbpp.h @@ -422,8 +422,8 @@ HB_PP_TOKEN, * PHB_PP_TOKEN; /* operation precedence for #if calculation */ #define HB_PP_PREC_NUL 0 -#define HB_PP_PREC_NOT 1 -#define HB_PP_PREC_LOG 2 +#define HB_PP_PREC_LOG 1 +#define HB_PP_PREC_NOT 2 #define HB_PP_PREC_REL 3 #define HB_PP_PREC_BIT 4 #define HB_PP_PREC_PLUS 5 diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c index c4dd417982..0faa17bbda 100644 --- a/harbour/source/vm/thread.c +++ b/harbour/source/vm/thread.c @@ -201,7 +201,7 @@ static void _hb_thread_wait_add( HB_COND_T * cond, PHB_WAIT_LIST pWaiting ) ULONG ulPostCount = 0; DosResetEventSem( pWaiting->cond, &ulPostCount ); #elif defined( HB_OS_WIN ) - /* It's not necessary becayse we have workaround for possible race + /* It's not necessary because we have workaround for possible race * condition inside _hb_thread_cond_wait() function */ /* WaitForSingleObject( pWaiting->cond, 0 ); */ @@ -740,7 +740,7 @@ static HB_GARBAGE_FUNC( hb_threadDestructor ) # if defined( HB_OS_OS2 ) DosCloseEventSem( pThread->pWaitList.cond ); pThread->pWaitList.cond = ( HEV ) 0; -# elif defined( HB_OS_WIM ) +# elif defined( HB_OS_WIN ) CloseHandle( pThread->pWaitList.cond ); pThread->pWaitList.cond = ( HANDLE ) 0; # endif @@ -846,7 +846,7 @@ PHB_THREADSTATE hb_threadStateNew( void ) #if defined( HB_COND_HARBOUR_SUPPORT ) # if defined( HB_OS_OS2 ) DosCreateEventSem( NULL, &pThread->pWaitList.cond, 0L, FALSE ); -# elif defined( HB_OS_WIM ) +# elif defined( HB_OS_WIN ) pThread->pWaitList.cond = CreateSemaphore( NULL, 0, 1, NULL ); # endif #endif