20000325-03:38 GMT+1 Victor Szakats <info@szelvesz.hu>

2000-03-25 02:39:37 +00:00
parent 306555d37c
commit 99b6ec6a39
12 changed files with 54 additions and 53 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,26 @@
+20000325-03:38 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * contrib/rdd_ads/ads1.c
+     ! BCC55 warning fixed.
+   * contrib/hbclip/make_clp.bat
+     ! Removed hard coded path for c compiler
+   * utils/hbextern/hbextern.prg
+     * Doesn't use hbclip.ch anymore.
+   * source/vm/pvalue.c
+     doc/subcodes.txt
+     - HB_PVALUE() removed the runtime error. From now on NIL will be returned 
+       if the requested parameter doesn't exist. This better fits in the 
+       average pattern of usage, and if needed the error case can checked by 
+       the caller.
+   * config/w32/global.cf
+   * config/dos/global.cf
+     * Slang and ncurses commented out for w32, added for dos but commented
+       out, too.
+   * bin/bld_tpl.*
+     ! GCC bug fixed (hard-coded .lib extension for the GT lib).
+   * source/rtl/diskspac.c
+     * Small opt.
+
 2000-03-23 20:45 GMT-5 David G. Holm <dholm@jsd-llc.com>

   * contrib/rdd_ads/ads1.c
@@ -22,7 +45,7 @@
     * (though I didn't activate it - see notes)
     * optimized some assigns.

-20000322-21:10 GMT -3 Luiz Rafael Culik <culik@sl.conex.net>
+20000322-21:10 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
    Missed from previos session
    *doc/en/array.txt
    doc/en/binnum.txt
@@ -44,7 +67,6 @@
        +code to support new subtags.
        *some enhacements

-
 20000322-22:30 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
    *doc/compiler.txt
     doc/gnulice.txt
@@ -69,7 +91,6 @@
        !fix code when a Return or Argument is only one line , to add the
         propery tags to enhace the first word

-
 20000322-19:35 EST Paul Tucker <ptucker@sympatico.ca>
   * include/fileio.ch
   * source/rtl/diskspac.c
--- a/harbour/bin/bld_tpl.bat
+++ b/harbour/bin/bld_tpl.bat
@@ -96,7 +96,7 @@ rem set HB_GT_LIB=
   if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtdos

   if "%HB_COMPILER%" == "bcc16"   bcc -O2 -mh -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
+   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
   goto END

 :A_W32
@@ -106,8 +106,8 @@ rem set HB_GT_LIB=
   if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin

   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib
   if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
   goto END
--- a/harbour/bin/bld_tpl.cmd
+++ b/harbour/bin/bld_tpl.cmd
@@ -28,7 +28,7 @@ rem set HB_GT_LIB=
 :HELP

   echo.
-   echo Usage: bld_tpl.bat filename
+   echo Usage: bld_tpl.cmd filename
   echo.
   echo Notes:
   echo.
@@ -96,7 +96,7 @@ rem set HB_GT_LIB=
   if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtdos

   if "%HB_COMPILER%" == "bcc16"   bcc -O2 -mh -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
+   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommon
   goto END

 :A_W32
@@ -106,8 +106,8 @@ rem set HB_GT_LIB=
   if "%HB_GT_LIB%" == "" set HB_GT_LIB=gtwin

   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %HB_GT_LIB%.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB%.lib -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%HB_GT_LIB% -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%HB_GT_LIB%.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib
   if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
   goto END
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -10,6 +10,8 @@ HB_GT_LIBS=\
        gtdos \
        gtpca \
        gtstd \
+#       gtcrs \
+#       gtsln \

 ifeq ($(HB_GT_LIB),)
   HB_GT_LIB = gtdos
--- a/harbour/config/w32/global.cf
+++ b/harbour/config/w32/global.cf
@@ -5,11 +5,11 @@
 all : first

 HB_GT_LIBS=\
-        gtcrs \
        gtpca \
-        gtsln \
        gtstd \
        gtwin \
+#       gtcrs \
+#       gtsln \

 ifeq ($(HB_GT_LIB),)
   HB_GT_LIB = gtwin
--- a/harbour/contrib/hbclip/make_clp.bat
+++ b/harbour/contrib/hbclip/make_clp.bat
@@ -8,9 +8,9 @@ clipper hbkeyput.prg /n
 clipper hbshadow.prg /n
 clipper hbvaltoc.prg /n

-c:\devl\msc\bin\cl /c /AL /Zl /Oalt /Gs /W3 hbcolind.c
-c:\devl\msc\bin\cl /c /AL /Zl /Oalt /Gs /W3 hbstod.c
-c:\devl\msc\bin\cl /c /AL /Zl /Oalt /Gs /W3 hbstodx.c
+cl /c /AL /Zl /Oalt /Gs /W3 hbcolind.c
+cl /c /AL /Zl /Oalt /Gs /W3 hbstod.c
+cl /c /AL /Zl /Oalt /Gs /W3 hbstodx.c

 del hbclip.lib

--- a/harbour/contrib/rdd_ads/ads1.c
+++ b/harbour/contrib/rdd_ads/ads1.c
@@ -1067,20 +1067,19 @@ static ERRCODE adsSetFilter( ADSAREAP pArea, LPDBFILTERINFO pFilterInfo )

 static ERRCODE adsSetScope( ADSAREAP pArea, LPDBORDSCOPEINFO sInfo )
 {
-   UNSIGNED32 ulRetVal;
-
   HB_TRACE(HB_TR_DEBUG, ("adsSetScope(%p, %p)", pArea, sInfo));

   if( pArea->hOrdCurrent )
   {
      if( sInfo->scopeValue )
      {
-         ulRetVal = AdsSetScope( pArea->hOrdCurrent, (UNSIGNED16) sInfo->nScope,
+         AdsSetScope( pArea->hOrdCurrent, (UNSIGNED16) sInfo->nScope,
              (UNSIGNED8*) sInfo->scopeValue,
              (UNSIGNED16) strlen( (const char *)sInfo->scopeValue), ADS_STRINGKEY );
      }
      else
         AdsClearScope( pArea->hOrdCurrent, (UNSIGNED16) sInfo->nScope );
+
      return SUCCESS;
   }
   else
--- a/harbour/doc/subcodes.txt
+++ b/harbour/doc/subcodes.txt
@@ -1249,26 +1249,6 @@ start from 3000
 *  $END$
 */

-/*  $DOC$
- *  $SUBCODE$
- *      BASE/3011
- *  $CATEGORY$
- *      arguments
- *  $ONELINER$
- *      Invalid argument passed to a function
- *  $DESCRIPTION$
- *      The attempt to retrieve the function argument that was not passed.
- *      The number of requested argument is greated then the number of
- *      passed arguments.
- *  $FUNCTION$
- *      PVALUE
- *  $STATUS$
- *      Harbour specific
- *  $SEEALSO$
- *
- *  $END$
- */
-
 /*  $DOC$
 *  $SUBCODE$
 *      BASE/3012
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -111,10 +111,12 @@
 #define HB_MKUSHORT( lo, hi )   ( ( USHORT ) ( ( ( USHORT ) hi ) << 8 ) | lo )
 #define HB_MKLONG( b1, b2, b3, b4 )  ( ( ( LONG ) b4 ) << 24 ) | \
                                     ( ( ( LONG ) b3 ) << 16 ) | \
-                                     ( ( ( LONG ) b2 ) <<  8 ) | b1
+                                     ( ( ( LONG ) b2 ) <<  8 ) | \
+                                     ( ( ( LONG ) b1 ) )
 #define HB_MKULONG( b1, b2, b3, b4 ) ( ( ( ULONG ) b4 ) << 24 ) | \
                                     ( ( ( ULONG ) b3 ) << 16 ) | \
-                                     ( ( ( ULONG ) b2 ) <<  8 ) | b1
+                                     ( ( ( ULONG ) b2 ) <<  8 ) | \
+                                     ( ( ( ULONG ) b1 ) )

 #define HB_SYMBOL_UNUSED( symbol ) ( void ) symbol

--- a/harbour/source/rtl/diskspac.c
+++ b/harbour/source/rtl/diskspac.c
@@ -83,7 +83,7 @@ HB_FUNC( DISKSPACE )
               EF_CANDEFAULT above)
      */

-      if( uiAction == E_DEFAULT || uiAction == E_BREAK )
+      if( uiAction != E_RETRY )
         break;
   }

@@ -116,7 +116,7 @@ HB_FUNC( DISKSPACE )

   uiType = HB_MIN( uiType, HB_DISK_TOTAL );

-   while( 1 )
+   while( TRUE )
   {

      typedef BOOL (WINAPI *P_GDFSE)(LPCTSTR, PULARGE_INTEGER, 
@@ -144,7 +144,7 @@ HB_FUNC( DISKSPACE )

      uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS );

-      SetLastError(0);
+      SetLastError( 0 );

      pGetDiskFreeSpaceEx = ( P_GDFSE ) GetProcAddress( GetModuleHandle( "kernel32.dll" ),
                                                        "GetDiskFreeSpaceExA");
@@ -220,7 +220,7 @@ HB_FUNC( DISKSPACE )
         DWORD dwNumberOfFreeClusters;
         DWORD dwTotalNumberOfClusters;

-         SetLastError(0);
+         SetLastError( 0 );

         if( GetDiskFreeSpace( szPath,
                               &dwSectorsPerCluster,
@@ -264,11 +264,9 @@ HB_FUNC( DISKSPACE )
                  with EF_CANDEFAULT above)
         */

-         if( uiAction == E_RETRY )
-            continue;
+         if( uiAction != E_RETRY )
+            break;
      }
-
-      break;
   }

 #else
--- a/harbour/source/vm/pvalue.c
+++ b/harbour/source/vm/pvalue.c
@@ -34,7 +34,6 @@
 */

 #include "hbapi.h"
-#include "hbapierr.h"
 #include "hbapiitm.h"

 HB_FUNC( HB_PVALUE )
@@ -44,7 +43,5 @@ HB_FUNC( HB_PVALUE )

   if( uiParam && uiParam <= pBase->item.asSymbol.paramcnt ) /* Valid number */
      hb_itemReturn( pBase + 1 + uiParam );
-   else
-      hb_errRT_BASE( EG_ARG, 3011, NULL, "HB_PVALUE" );
 }

--- a/harbour/utils/hbextern/hbextern.prg
+++ b/harbour/utils/hbextern/hbextern.prg
@@ -39,7 +39,9 @@
 #include "common.ch"
 #include "fileio.ch"

-#include "hbclip.ch"
+#ifndef __HARBOUR__
+   #define hb_OSNewLine() ( Chr( 13 ) + Chr( 10 ) )
+#endif

 #define PATH_SEPARATOR "\"
 #define BASE_DIR "..\..\source\"
@@ -57,7 +59,7 @@ PROCEDURE MAIN()
   LOCAL nOutput
   LOCAL nTime:=SECONDS()
   
-   nOutput =FCREATE( "hbextern.ch_" )
+   nOutput := FCREATE( "hbextern.ch_" )
   IF nOutput > 0
      FOR i:=1 TO LEN(aDirs)
         FWRITE( nOutput, "// Files from: " +aDirs[i] )