From e7ff8f5a0d019307db5e586e3b18ddc765685a1d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 1 Feb 2011 00:56:49 +0000 Subject: [PATCH] 2011-02-01 01:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * contrib/hbnetio/utils/hbnetio/netiosrv.prg + Keep order of filter lists. * utils/hbmk2/hbmk2.prg ! Use _hbmkcpp_.cpp (instead of _hbmkcpp.cpp) on non MS-DOS platforms. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aaaf34f1cc..83071745ea 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-01 01:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * contrib/hbnetio/utils/hbnetio/netiosrv.prg + + Keep order of filter lists. + + * utils/hbmk2/hbmk2.prg + ! Use _hbmkcpp_.cpp (instead of _hbmkcpp.cpp) on + non MS-DOS platforms. + 2011-02-01 01:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbmk2/hbmk2.prg ! do not use the first source file name to set hbmk[ _HBMK_cPROGNAME ] diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg index 710a585d8d..56419405ce 100644 --- a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg +++ b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg @@ -104,6 +104,8 @@ PROCEDURE Main( ... ) netiosrv[ _NETIOSRV_mtxFilters ] := hb_mutexCreate() hb_HKeepOrder( netiosrv[ _NETIOSRV_hConnection ], .T. ) + hb_HKeepOrder( netiosrv[ _NETIOSRV_hAllow ], .T. ) + hb_HKeepOrder( netiosrv[ _NETIOSRV_hBlock ], .T. ) netiomgm[ _NETIOSRV_cName ] := "Management" netiomgm[ _NETIOSRV_nPort ] := _NETIOMGM_PORT_DEF @@ -117,6 +119,8 @@ PROCEDURE Main( ... ) netiomgm[ _NETIOSRV_mtxFilters ] := hb_mutexCreate() hb_HKeepOrder( netiomgm[ _NETIOSRV_hConnection ], .T. ) + hb_HKeepOrder( netiomgm[ _NETIOSRV_hAllow ], .T. ) + hb_HKeepOrder( netiomgm[ _NETIOSRV_hBlock ], .T. ) FOR EACH cParam IN { ... } DO CASE diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 990afc694d..48dfd3c17f 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5175,7 +5175,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ! Empty( cBin_CompCPP ) .AND. ; hbmk[ _HBMK_lHBCPPMM ] +#if defined( __PLATFORM__DOS ) l_cCPPSTUB := DirAddPathSep( hbmk[ _HBMK_cWorkDir ] ) + "_hbmkcpp.cpp" +#else + l_cCPPSTUB := DirAddPathSep( hbmk[ _HBMK_cWorkDir ] ) + "_hbmkcpp_" + FNameNameGet( hbmk[ _HBMK_cFIRST ] ) + ".cpp" +#endif IF ! hbmk[ _HBMK_lCLEAN ]