From 1e3eeee7d1fdb2047e7a1bbdc9281e7e1330f09a Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Wed, 22 Mar 2000 19:05:51 +0000 Subject: [PATCH] 20000322-14:05 --- harbour/ChangeLog | 6 ++++++ harbour/source/rtl/diskspac.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e00cbbd7a1..aab924ce22 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +20000322-14:05 EST Paul Tucker + * 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 - include/hbclip.ch diff --git a/harbour/source/rtl/diskspac.c b/harbour/source/rtl/diskspac.c index 0ab022ec87..722a7aff79 100644 --- a/harbour/source/rtl/diskspac.c +++ b/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 *