diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2a9c4740cb..e870b5c4c9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-23 00:43 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/global.mk + + added yet another path for cross-mingw compiler detection + + * harbour/contrib/hbwin/win_prn2.c + ! fixed iResult defined twice by mistake + 2009-11-22 21:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_prn1.c * contrib/hbwin/win_prn2.c diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 272bb6612f..c870379323 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -546,7 +546,7 @@ ifeq ($(HB_COMPILER),) # generic detection for mingw cross-compiler ifeq ($(HB_CCPATH)$(HB_CCPREFIX),) - MINGW_BASE_LIST := /usr /usr/local /usr/local/mingw32 /opt/xmingw + MINGW_BASE_LIST := /usr /usr/local /usr/local/mingw32 /opt/xmingw /opt/cross MINGW_PREFIX := $(firstword $(foreach d, $(MINGW_BASE_LIST), $(wildcard $(d)/bin/i?86*-mingw*-gcc$(HB_HOST_BIN_EXT)))) ifneq ($(MINGW_PREFIX),) MINGW_PREFIX := $(MINGW_PREFIX:gcc$(HB_HOST_BIN_EXT)=) diff --git a/harbour/contrib/hbwin/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c index dda0f3f9a7..f91fa8e10a 100644 --- a/harbour/contrib/hbwin/win_prn2.c +++ b/harbour/contrib/hbwin/win_prn2.c @@ -393,7 +393,6 @@ HB_FUNC( PRINTFILERAW ) const char * pszDocName = HB_ISCHAR( 3 ) ? hb_parc( 3 ) : hb_parc( 2 ); HANDLE hPrinter; - int iResult; LPTSTR lpPrinterName = HB_TCHAR_CONVTO( pszPrinterName ); if( OpenPrinter( lpPrinterName, &hPrinter, NULL ) != 0 )