diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7e21b2f394..229ee6f5f6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-25 03:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * Some casing fixes. + + * ChangeLog + + Added more incompat notes to 2009-06-20 22:24 UTC+0200 entry. + + * source/pp/pplib.c + * source/compiler/hbcmplib.c + * 'const' cleanup. + + * source/vm/fm.c + - Deleted HB_FM_STAT() and HB_FM_NOSTAT() functions. + 2009-06-24 22:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbapi.h * include/hbapiitm.h @@ -935,6 +949,11 @@ ; NOTE: INCOMPATIBLE. You'll need to modify hb_par*()/hb_stor*() instances where they are used with extra parameter to hb_parv*()/hb_storv*(). [vszakats] + ; NOTE: INCOMPATIBLE. hb_parnl() no longer pulls the value of + date types. If you want to retrieve date as numeric value, + use hb_pardl(). hb_parl() will no longer consider numeric + non-zero values as true. + [vszakats] * harbour/examples/uhttpd2/socket.c * harbour/examples/httpsrv/socket.c diff --git a/harbour/INSTALL b/harbour/INSTALL index f23fadd69d..35c68091f1 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -65,14 +65,14 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE only. For a peace of mind, avoid using spaces, quotes in the name. You can leave it empty, in this case the results will be created under the current directory tree. - - With mingw, sh.exe (part of msys) mustn't be in the PATH. + - With mingw, sh.exe (part of MSYS) mustn't be in the PATH. - Windows with MinGW + msys + Windows with MinGW + MSYS ------------------------- - (for plain MinGW *without* msys, which is the recommended way: see above) + (for plain MinGW *without* MSYS, which is the recommended way: see above) - Make sure to have msys and MinGW properly configured. - msys should be put in PATH *before* MinGW. + Make sure to have MSYS and MinGW properly configured. + MSYS should be put in PATH *before* MinGW. > set HB_INSTALL_PREFIX= > sh make_gnu.sh install @@ -149,7 +149,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD HB_INC_QT=C:\Qt\4.5.1\include HB_INC_SQLITE3=C:\sqlite3 (defaults to locally hosted version on win/os2) - NOTES: - For MinGW + msys and Cygwin you have to use forward slashes + NOTES: - For MinGW + MSYS and Cygwin you have to use forward slashes and also Cygwin drive notation for Cygwin. - Spaces in directory names aren't currently supported. (You can use short name alias on Windows platform, though) @@ -348,7 +348,7 @@ EXAMPLES call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1 --- - --- MinGW GCC (make sure msys (sh.exe) isn't in the PATH) + --- MinGW GCC (make sure MSYS (sh.exe) isn't in the PATH) set PATH=C:\mingw\bin;%PATH% rem set HB_COMPILER=mingw @@ -356,7 +356,7 @@ EXAMPLES call make_gnu.bat %1 %2 > log-%HB_COMPILER%.txt 2>&1 --- - --- MinGW GCC + msys + --- MinGW GCC + MSYS set PATH=C:\msys\1.0.11\bin;%PATH% set PATH=C:\mingw\bin;%PATH% rem @@ -477,7 +477,7 @@ EXAMPLES --8<-- rem ; Add these *before* above sample scripts to configure 3rd party dependencies. - rem For 'MinGW + msys' and Cygwin you'll have to use forward slashes and + rem For 'MinGW + MSYS' and Cygwin you'll have to use forward slashes and rem also Cygwin drive notation for Cygwin. set HB_INC_ADS=C:\ads\acesdk set HB_INC_ALLEGRO=C:\allegro\include @@ -697,7 +697,7 @@ QUICK START TO BUILD YOUR OWN HARBOUR APPLICATIONS - You can access hbmk2 using absolute or relative paths, and it will work equally well: 'C:\hb20\bin\hbmk2 hello.prg' - - GNU Make, msys, or any other extra tool is *not* needed + - GNU Make, MSYS, or any other extra tool is *not* needed to build a Harbour application with above methods. diff --git a/harbour/source/compiler/hbcmplib.c b/harbour/source/compiler/hbcmplib.c index d4b46de274..3518540d90 100644 --- a/harbour/source/compiler/hbcmplib.c +++ b/harbour/source/compiler/hbcmplib.c @@ -135,7 +135,8 @@ HB_FUNC( HB_COMPILEBUF ) HB_FUNC( HB_COMPILEFROMBUF ) { int iResult, argc; - char ** argv, * szSource; + char ** argv; + const char * szSource; BYTE * pBuffer; ULONG ulLen; diff --git a/harbour/source/pp/pplib.c b/harbour/source/pp/pplib.c index e23c8714d8..cf376ec087 100644 --- a/harbour/source/pp/pplib.c +++ b/harbour/source/pp/pplib.c @@ -153,7 +153,7 @@ HB_FUNC( __PP_INIT ) if( pState ) { - char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 ); + const char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 ); PHB_ITEM ppItem; pStatePtr = ( PHB_PP_STATE * ) hb_gcAlloc( sizeof( PHB_PP_STATE ), @@ -216,7 +216,7 @@ HB_FUNC( __PP_ADDRULE ) if( pState ) { - char * szText = hb_parc( 2 ); + const char * szText = hb_parc( 2 ); ULONG ulLen = hb_parclen( 2 ); if( szText ) diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index 66d5e3a95e..226e1d4be7 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -1283,12 +1283,6 @@ ULONG hb_xquery( USHORT uiMode ) return ulResult; } -#ifdef HB_FM_STATISTICS -HB_FUNC( HB_FM_STAT ) {} -#else -HB_FUNC( HB_FM_NOSTAT ) {} -#endif - #if defined( __cplusplus ) && defined( HB_FM_STATISTICS ) void * operator new( size_t nSize ) {