diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e735cec1cd..11a39eecd0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-23 18:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/rddads/adsmgmnt.c + ! Blind fix to ADSMGGETWORKERTHREADACTIVITY() where the + first element in list wasn't returned. + Please test, I couldn't. + + * source/vm/fm.c + ! Stupid typo. (I guess I'm completely confused by separated + "#" and preprocessor command :/ Second typo in two lines.) + 2008-09-23 17:09 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/os2/gcc.cf * enabled -DTCPV40HDRS in default builds, can be disabled by diff --git a/harbour/contrib/rddads/adsmgmnt.c b/harbour/contrib/rddads/adsmgmnt.c index d25e56378e..238bedc9ac 100644 --- a/harbour/contrib/rddads/adsmgmnt.c +++ b/harbour/contrib/rddads/adsmgmnt.c @@ -626,13 +626,13 @@ HB_FUNC( ADSMGGETWORKERTHREADACTIVITY ) PHB_ITEM pArrayItm = hb_arrayGetItemPtr( pArray, ulCount ); hb_arrayNew( pArrayItm, 6 ); - hb_arraySetNL( pArrayItm, 1, astWorkerThreadActivity[ ulCount ].ulThreadNumber ); - hb_arraySetNI( pArrayItm, 2, astWorkerThreadActivity[ ulCount ].usOpCode ); - hb_arraySetC( pArrayItm, 3, ( char * ) astWorkerThreadActivity[ ulCount ].aucUserName ); - hb_arraySetNI( pArrayItm, 4, astWorkerThreadActivity[ ulCount ].usConnNumber ); - hb_arraySetNI( pArrayItm, 5, astWorkerThreadActivity[ ulCount ].usReserved1 ); + hb_arraySetNL( pArrayItm, 1, astWorkerThreadActivity[ ulCount - 1 ].ulThreadNumber ); + hb_arraySetNI( pArrayItm, 2, astWorkerThreadActivity[ ulCount - 1 ].usOpCode ); + hb_arraySetC( pArrayItm, 3, ( char * ) astWorkerThreadActivity[ ulCount - 1 ].aucUserName ); + hb_arraySetNI( pArrayItm, 4, astWorkerThreadActivity[ ulCount - 1 ].usConnNumber ); + hb_arraySetNI( pArrayItm, 5, astWorkerThreadActivity[ ulCount - 1 ].usReserved1 ); #if ADS_LIB_VERSION >= 800 - hb_arraySetC( pArrayItm, 6, ( char * ) astWorkerThreadActivity[ ulCount ].aucOSUserLoginName ); + hb_arraySetC( pArrayItm, 6, ( char * ) astWorkerThreadActivity[ ulCount - 1 ].aucOSUserLoginName ); #else hb_arraySetC( pArrayItm, 6, NULL ); #endif diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index b4080ac4e7..81135d97d7 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -122,7 +122,7 @@ # pragma warn -prc # pragma warn -rch # elif defined( _MSC_VER ) -# defined USE_DL_PREFIX +# define USE_DL_PREFIX # endif # include "dlmalloc.c" # if defined( __BORLANDC__ )