From ed752ded2a4da75ad439e1ce00ddcb2db15d6234 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Oct 1999 13:32:14 +0000 Subject: [PATCH] 19991025-15:20 GMT+1 Victor Szel --- harbour/ChangeLog | 6 ++++++ harbour/source/rtl/net.c | 2 +- harbour/tests/memory.prg | 30 ++++++++++++++++-------------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 332d57ec18..99c12fbb2a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19991025-15:20 GMT+1 Victor Szel + * tests/memory.prg + + Using hbmemory.ch + * source/rtl/net.c + + cast added for MSVC + 19991025-14:58 GMT+1 Victor Szel * source/rtl/net.c + Name buffer length corrected. diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c index bdf20e5381..bc15a397c3 100644 --- a/harbour/source/rtl/net.c +++ b/harbour/source/rtl/net.c @@ -61,7 +61,7 @@ HARBOUR HB_NETNAME( void ) #if defined(_Windows) || defined(WINNT) { DWORD ulLen = MAX_COMPUTERNAME_LENGTH + 1; - char * pszValue = hb_xgrab( ulLen ); + char * pszValue = ( char * ) hb_xgrab( ulLen ); pszValue[ 0 ] = '\0'; diff --git a/harbour/tests/memory.prg b/harbour/tests/memory.prg index e175f5972d..b9faf14dee 100644 --- a/harbour/tests/memory.prg +++ b/harbour/tests/memory.prg @@ -4,21 +4,23 @@ /* ; Donated to the public domain by Victor Szel */ +#include "hbmemory.ch" + FUNCTION Main() - ? 0, MEMORY( 0 ) - ? 1, MEMORY( 1 ) - ? 2, MEMORY( 2 ) - ? 3, MEMORY( 3 ) - ? 4, MEMORY( 4 ) - ? 101, MEMORY( 101 ) - ? 102, MEMORY( 102 ) - ? 103, MEMORY( 103 ) - ? 104, MEMORY( 104 ) - ? 105, MEMORY( 105 ) - ? 1001, MEMORY( 1001 ) - ? 1002, MEMORY( 1002 ) - ? 1003, MEMORY( 1003 ) - ? 1004, MEMORY( 1004 ) + ? "HB_MEM_CHAR " , MEMORY( HB_MEM_CHAR ) + ? "HB_MEM_BLOCK " , MEMORY( HB_MEM_BLOCK ) + ? "HB_MEM_RUN " , MEMORY( HB_MEM_RUN ) + ? "HB_MEM_VM " , MEMORY( HB_MEM_VM ) + ? "HB_MEM_EMS " , MEMORY( HB_MEM_EMS ) + ? "HB_MEM_FM " , MEMORY( HB_MEM_FM ) + ? "HB_MEM_FMSEGS " , MEMORY( HB_MEM_FMSEGS ) + ? "HB_MEM_SWAP " , MEMORY( HB_MEM_SWAP ) + ? "HB_MEM_CONV " , MEMORY( HB_MEM_CONV ) + ? "HB_MEM_EMSUSED " , MEMORY( HB_MEM_EMSUSED ) + ? "HB_MEM_USED " , MEMORY( HB_MEM_USED ) + ? "HB_MEM_USEDMAX " , MEMORY( HB_MEM_USEDMAX ) + ? "HB_MEM_STACKITEMS" , MEMORY( HB_MEM_STACKITEMS ) + ? "HB_MEM_STACK " , MEMORY( HB_MEM_STACK ) RETURN NIL