From b76e59a5fedd26430d3917dfeb858973f210b96f Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 10 Nov 2006 11:06:29 +0000 Subject: [PATCH] 2006-11-10 12:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-mkslib.sh + added ${L_USR} to gcc parameters * harbour/source/pp/ppgen.c ! fixed minor typo in printf() format --- harbour/ChangeLog | 7 +++++++ harbour/bin/hb-mkslib.sh | 2 +- harbour/source/pp/ppgen.c | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 87ffe4d8c5..5a95178047 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ + * cleaned BCC warnings + + * harbour/source/rdd/dbfcdx/dbfcdx1.c + ! fixed ordKeyGoto() positioning when active filter is set and no + controlling order + +2006-11-10 12:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-mkslib.sh + added ${L_USR} to gcc parameters diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index df44d9305e..d66438c3f3 100644 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -128,7 +128,7 @@ else #FULLNAME="${BASE}-${VERSION}${SLIB_EXT}" #FULLNAME="${BASE}{SLIB_EXT}.${VERSION}" FULLNAME="${LIB_NAME}${SLIB_EXT}" - ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} && \ + ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${L_USR} && \ cd "${dir}" && \ mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" fi diff --git a/harbour/source/pp/ppgen.c b/harbour/source/pp/ppgen.c index b17c0b2ef6..b7ebca43d8 100644 --- a/harbour/source/pp/ppgen.c +++ b/harbour/source/pp/ppgen.c @@ -93,14 +93,14 @@ static void hb_pp_writeToken( FILE * fout, PHB_PP_TOKEN pToken, if( pToken->pNext ) fprintf( fout, " { %s +%2d", szName, iToken + iOptional + 1 ); else - fprintf( fout, " { NULL%*.s", i, "" ); + fprintf( fout, " { NULL%*s", i, "" ); if( iOptional ) fprintf( fout, ", %s +%2d", szName, iToken + 1 ); else - fprintf( fout, ", NULL%*.s", i, "" ); + fprintf( fout, ", NULL%*s", i, "" ); i = 16 - strlen( pToken->value ); - fprintf( fout, ", \"%s\", %*.s %2d,%2d, 0x%04x, %d }%s\n", + fprintf( fout, ", \"%s\", %*s %2d,%2d, 0x%04x, %d }%s\n", pToken->value, i < 0 ? 0 : i, "", pToken->len, pToken->spaces,