20000322-14:05

harbour/ChangeLog

@@ -1,3 +1,9 @@
+20000322-14:05 EST Paul Tucker <ptucker@sympatico.ca>
+   * source/rtl/diskspac.c
+     * made the msc and __gnuc__ branch the same.
+     * the diff is now for borland.
+     * add a note.
+
 20000322-16:33 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    - include/hbclip.ch

harbour/source/rtl/diskspac.c

@@ -161,7 +161,7 @@ HB_FUNC( DISKSPACE )
                   memcpy( &i64RetVal, &i64TotalBytes, sizeof( ULARGE_INTEGER ) );
             }
 
-            #if defined(__GNUC__)
+            #if defined(__GNUC__) || defined( _MSC_VER)
 
                /* NOTE: In Cygwin/Mingw32 (egcs-2.91.57) the declaration for
                         ULARGE_INTEGER differs from the MS standard.
@@ -181,6 +181,9 @@ HB_FUNC( DISKSPACE )
                }
 
             #else
+               /* NOTE: Borland doesn't seem to deal with the un-named
+                        struct that is part of ULARGE_INTEGER
+                        [pt]  */
 
                dSpace  = ( double ) i64RetVal.u.HighPart +
                          ( double ) i64RetVal.u.HighPart *