diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fca657afba..51edd4b381 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-10-22 13:55 UTC+0300 Alexander Kresin + * makefile.bc + * makefile.nt + * makefile.vc + * lang/msgsrwin.c and symbol.prg ( to makefile.nt only ) added. + * source/rdd/dbcmd.c + ! Ordscope() fixed - first parameter is TOPSCOPE by default now. + 2003-10-21 10:23 UTC-0800 Luis Krause Mantilla * source/vm/codebloc.c ! Fixed detached local bug (borrowed from xharbour) diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 259e4fcf8b..b1312fdb2c 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -427,6 +427,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgslwin.obj \ $(OBJ_DIR)\msgsr852.obj \ $(OBJ_DIR)\msgsriso.obj \ + $(OBJ_DIR)\msgsrwin.obj \ $(OBJ_DIR)\msgzhgb.obj \ $(OBJ_DIR)\msgzhb5.obj diff --git a/harbour/makefile.nt b/harbour/makefile.nt index cc0bafca14..342c9904c1 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -413,6 +413,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\scrollbr.obj \ $(OBJ_DIR)\setfunc.obj \ $(OBJ_DIR)\setta.obj \ + $(OBJ_DIR)\symbol.obj \ $(OBJ_DIR)\tbcolumn.obj \ $(OBJ_DIR)\tbrowse.obj \ $(OBJ_DIR)\tclass.obj \ @@ -480,6 +481,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgslwin.obj \ $(OBJ_DIR)\msgsr852.obj \ $(OBJ_DIR)\msgsriso.obj \ + $(OBJ_DIR)\msgsrwin.obj \ $(OBJ_DIR)\msgzhgb.obj \ $(OBJ_DIR)\msgzhb5.obj diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 0698f0e3c7..da8299ca22 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -445,6 +445,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgslwin.obj \ $(OBJ_DIR)\msgsr852.obj \ $(OBJ_DIR)\msgsriso.obj \ + $(OBJ_DIR)\msgsrwin.obj \ $(OBJ_DIR)\msgzhgb.obj \ $(OBJ_DIR)\msgzhb5.obj diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index afb3e8032a..cb9ac2df72 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -3043,12 +3043,12 @@ HB_FUNC( ORDSCOPE ) if( s_pCurrArea ) { - if( !ISNUM( 1 ) || (!ISNIL(2) && !( ISCHAR(2) || ISNUM(2) || ISDATE(2) || ISLOG(2) ))) + if( (!ISNIL(2) && !( ISCHAR(2) || ISNUM(2) || ISDATE(2) || ISLOG(2) ))) { hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDSCOPE" ); return; } - sInfo.nScope = hb_parni( 1 ); + sInfo.nScope = (ISNUM(1))? hb_parni( 1 ) : 0; SELF_SCOPEINFO( ( AREAP ) s_pCurrArea->pArea, sInfo.nScope, pScopeValue );