diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 75b5801343..239ce3d2fc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-16 15:07 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbmisc/stringp.prg + % use hb_default() instead of local variation named default() + 2012-11-16 14:53 UTC+0100 Viktor Szakats (harbour syenar.net) + contrib/xhb/xhbctbit.c * contrib/xhb/xhb.hbp diff --git a/harbour/contrib/hbmisc/stringp.prg b/harbour/contrib/hbmisc/stringp.prg index 1cfd1b5672..ca16573f18 100644 --- a/harbour/contrib/hbmisc/stringp.prg +++ b/harbour/contrib/hbmisc/stringp.prg @@ -52,15 +52,6 @@ #include "hboo.ch" -/* $Doc$ - * $FuncName$ Default( , ) - * $Description$ If argument is not set, return default - * $End$ */ - -STATIC FUNCTION DEFAULT( xArg, xDef ) - RETURN iif( !( ValType( xArg ) == ValType( xDef ) ), xDef, xArg ) - - /* $Doc$ * $FuncName$ ToChar( , [cSeparator], [lDebug] ) * $Description$ Convert to character @@ -92,8 +83,9 @@ FUNCTION ToChar( xTxt, cSeparator, lDebug ) LOCAL nLen LOCAL aData - cSeparator := Default( cSeparator, " " ) - lDebug := Default( lDebug, .F. ) + hb_default( @cSeparator, " " ) + hb_default( @lDebug, .F. ) + cValTxt := ValType( xTxt ) DO CASE