diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8fffab2680..d00d1bb514 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,42 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-20 11:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + -depincpath= now supports multiple paths separated by ';' + (on all platforms) + + * contrib/3rd/sqlite3/sqlite3.hbp + ! Fixed wrong hbmk2 filter expression. + + * contrib/hbmzip/3rd/minizip/minizip.hbp + * contrib/rddads/rddads.hbp + * contrib/hbpre.hbm + * -std=c89/gnu89 -> -std=c90/gnu90. same, but gcc recommends the latter. + + * contrib/hbhpdf/core.c + * contrib/rddsql/sqlmix.c + ! Fixed C++ comments. + + * contrib/hbmxml/hbmxml.hbp + * contrib/hbmxml/3rd/minixml/mxml.hbp + ! -std=gnu90 for strdup() + + * contrib/hbbz2/3rd/bz2/bz2.hbp + * contrib/hbssl/hbssl.hbm + ! -std=gnu90 for fileno + + * contrib/hbfimage/hbfimage.hbp + * contrib/gtalleg/gtalleg.hbm + ! -std=gnu90 for 3rd party headers. + + * contrib/hbbz2/3rd/bz2/bz2.hbp + % Enabled BZ_STRICT_ANSI. This effectively disanled bzdopen(), + so if anyone needs it, speak up. + + * contrib/hbqt/hbqt_common.hbm + ! Temp hack to override -std option for C++. + 2011-04-20 03:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + new filter values: lngcpp and lngc. Can be used to diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp index 59e3d950c2..9ed9d7274a 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp +++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp @@ -6,7 +6,7 @@ -stop{poccarm} # NOTE: old msvcarm can't cope with some PP directives. [vszakats] --stop{msvcarm&HB_COMP_VER!='1200'&HB_COMP_VER!='1300'&HB_COMP_VER!='1310')} +-stop{msvcarm&(HB_COMP_VER='1200')&!(HB_COMP_VER='1300')&!(HB_COMP_VER='1310')} # NOTE: dos based watcom runs out of memory. [vszakats] -stop{HB_HOST_PLAT='dos'&watcom} # NOTE: disable *nix builds on non-*nix platforms; [vszakats] diff --git a/harbour/contrib/gtalleg/gtalleg.hbm b/harbour/contrib/gtalleg/gtalleg.hbm index 73bcc0ff73..957d1fa62e 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbm +++ b/harbour/contrib/gtalleg/gtalleg.hbm @@ -21,5 +21,8 @@ -iflag={bcc}-a +# For allegro headers +-cflag=-std=gnu90{!lngcpp&allgcc} + gtalleg.c ssf.c diff --git a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp b/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp index 7329401ad0..dba410e67c 100644 --- a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp +++ b/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp @@ -25,6 +25,10 @@ randtabl.c {bcc}-aflag=/C +-cflag=-DBZ_STRICT_ANSI +# For fileno() +-cflag=-std=gnu90{!lngcpp&allgcc} + # ORIGIN http://www.bzip.org/ # VER 1.0.6 # URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz diff --git a/harbour/contrib/hbfimage/hbfimage.hbp b/harbour/contrib/hbfimage/hbfimage.hbp index 37049caf33..fe9d268888 100644 --- a/harbour/contrib/hbfimage/hbfimage.hbp +++ b/harbour/contrib/hbfimage/hbfimage.hbp @@ -23,6 +23,9 @@ -instfile=inc:freeimag.ch -instfile=inc:hbfimage.hbx +# For FreeImage headers +-cflag=-std=gnu90{!lngcpp&allgcc} + hbfimage.hbx fi_winfu.c diff --git a/harbour/contrib/hbhpdf/core.c b/harbour/contrib/hbhpdf/core.c index 504b3de0c4..de762124ea 100644 --- a/harbour/contrib/hbhpdf/core.c +++ b/harbour/contrib/hbhpdf/core.c @@ -1573,7 +1573,7 @@ HB_FUNC( HPDF_VERSION_TEXT ) hb_retc_const( HPDF_VERSION_TEXT ); } /*----------------------------------------------------------------------*/ -// New Functions in LibHaru 2.2.0 +/* New Functions in LibHaru 2.2.0 */ /*----------------------------------------------------------------------*/ /* HPDF_EXPORT(HPDF_STATUS) diff --git a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp index 3d4e444ca3..8f288bd980 100644 --- a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp +++ b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp @@ -16,6 +16,9 @@ {win}-cflag=-DWIN32 -DWIN {win|dos|os2}-cflag=-D_EOL_CRLF +# For strdup() +-cflag=-std=gnu90{!lngcpp&allgcc} + mxml_att.c mxml_ent.c mxml_fil.c diff --git a/harbour/contrib/hbmxml/hbmxml.hbp b/harbour/contrib/hbmxml/hbmxml.hbp index 253ea73451..c3b6f68706 100644 --- a/harbour/contrib/hbmxml/hbmxml.hbp +++ b/harbour/contrib/hbmxml/hbmxml.hbp @@ -19,6 +19,9 @@ -instfile=inc:hbmxml.ch -instfile=inc:hbmxml.hbx +# For strdup() +-cflag=-std=gnu90{!lngcpp&allgcc} + hbmxml.hbx core.c diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp index ab32dd7ab9..8c8bf66059 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp +++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp @@ -14,7 +14,7 @@ -pic # for f*64() functions --cflag=-std=gnu89{!lngcpp&allgcc} +-cflag=-std=gnu90{!lngcpp&allgcc} ioapi.c zip.c diff --git a/harbour/contrib/hbpre.hbm b/harbour/contrib/hbpre.hbm index 1c925d817b..94b737e0c6 100644 --- a/harbour/contrib/hbpre.hbm +++ b/harbour/contrib/hbpre.hbm @@ -17,6 +17,6 @@ {_HB_BUILD_LIBDYN}-hbdyn --cflag=-std=c89{!lngcpp&allgcc} +-cflag=-std=c90{!lngcpp&allgcc} -warn=yes diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index 84bcf7005c..43de5a3753 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -17,6 +17,8 @@ -w3 -es2 +-cflag=-std=gnu++98{allgcc} + -i. -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64|pcc} diff --git a/harbour/contrib/hbssl/hbssl.hbm b/harbour/contrib/hbssl/hbssl.hbm index 8c07a26f1c..6c1293cb2a 100644 --- a/harbour/contrib/hbssl/hbssl.hbm +++ b/harbour/contrib/hbssl/hbssl.hbm @@ -31,6 +31,9 @@ # Patent will expire in 2010/2011 -cflag=-DOPENSSL_NO_IDEA +# For _fileno() in openssl/applink.c +-cflag=-std=gnu90{!lngcpp&allgcc} + -instfile=inc:hbssl.ch -instfile=inc:hbssl.hbx diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index 72fac85dd0..2df3c3fedf 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -9,9 +9,6 @@ -w3 -es2 -# for ADS headers --cflag=-std=gnu89{!lngcpp&allgcc} - -stop{!(linux|win)} -depkeyhead=ads:ace.h @@ -30,6 +27,9 @@ # To avoid a warning in ACE header -cflag=-Wno-pragmas{allmingw} +# for ADS headers +-cflag=-std=gnu90{!lngcpp&allgcc} + rddads.hbx ads1.c diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index 68ed7e2c50..9e5012a4c2 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -575,7 +575,7 @@ static void hb_mixTagAddKeyPos( PMIXTAG pTag, PMIXNODE pNode, unsigned int uiPos MIX_COPY_CHILDS_EXTERNAL( pTag, pNewNode, 1, pNode, k + 1, MIX_NODE_ORDER - k ); for ( j = 1; j <= MIX_NODE_ORDER - k; j++ ) { - pNewNode->Child[ j ]->Parent = pNewNode; // Do NOT forget to re-parent + pNewNode->Child[ j ]->Parent = pNewNode; /* Do NOT forget to re-parent */ } } pNode->KeyCount = k; @@ -1887,7 +1887,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, HB_USHORT uiIndex, LPDBORD break; case DBOI_NUMBER: - pOrderInfo->itmResult = hb_itemPutNI( pOrderInfo->itmResult, uiTag ); // kitaip + pOrderInfo->itmResult = hb_itemPutNI( pOrderInfo->itmResult, uiTag ); /* kitaip */ break; case DBOI_ISCOND: diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index beda34867a..857519a381 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2732,7 +2732,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cParam := MacroProc( hbmk, SubStr( cParam, Len( "-depincpath=" ) + 1 ), aParam[ _PAR_cFileName ] ) IF dep_split_arg( hbmk, cParam, @cParam, @tmp ) - AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) ) ) + FOR EACH tmp1 IN hb_ATokens( tmp, ";" ) + AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp1 ), aParam[ _PAR_cFileName ] ) ) ) + NEXT ENDIF CASE Left( cParam, Len( "-depincpathlocal=" ) ) == "-depincpathlocal=" @@ -12006,7 +12008,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-depkeyhead=" , I_( " is the name of the dependency. is the key header (.h) of the package dependency. Multiple alternative headers can be specified." ) },; { "-depoptional=" , I_( " is the name of the dependency. can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },; { "-depcontrol=" , I_( " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_" ) },; - { "-depincpath=" , I_( " is the name of the dependency. Add to the header detection path list" ) },; + { "-depincpath=" , I_( " is the name of the dependency. Add to the header detection path list. May be ';' delimited list of paths." ) },; { "-depincpathlocal= " , I_( " is the name of the dependency. Add to the header detection path list, where is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },; { "-depimplibs=" , I_( " is the name of the dependency. Add to the import library source list" ) },; { "-depimplibd=" , I_( " is the name of the dependency. Set generated import library name to " ) },;