diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e3f6d3f974..47bacd005b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-12-10 17:30 UTC-0500 David G. Holm + + * source/compiler/harbour.c + * source/compiler/harbour.sly + * source/compiler/harbour.y + * source/rtl/isprint.c + * source/vm/fm.c + * source/vm/hvm.c + ! Never include malloc.h, because: 1) It been obsoleted by stdlib.h + in Standard C; and 2) The use of malloc.h is forbidden in GCC 3.x. + 2003-12-05 16:05 UTC+0100 Ryszard Glab * source/rtl/gtcrs/gtcrs.c * characters with code > 128 are displayed correctly now diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c index 9d1a9fca48..80004fa578 100644 --- a/harbour/source/compiler/harbour.c +++ b/harbour/source/compiler/harbour.c @@ -46,7 +46,9 @@ * */ -#include /* required for allocating and freeing memory */ +/* malloc.h has been obsoleted by stdlib.h, which is included via hbcomp.h +#include +*/ #include "hbcomp.h" #include "hbhash.h" diff --git a/harbour/source/compiler/harbour.sly b/harbour/source/compiler/harbour.sly index 5198012692..d187387c4e 100644 --- a/harbour/source/compiler/harbour.sly +++ b/harbour/source/compiler/harbour.sly @@ -33,7 +33,9 @@ * 2) Support this syntax: nPtr := @Hello() */ +/* malloc.h has been obsoleted by stdlib.h, which is included via hbcomp.h #include +*/ #include "hbcomp.h" diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 6aa7b61858..ac889167cf 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -33,7 +33,9 @@ * 2) Support this syntax: nPtr := @Hello() */ +/* malloc.h has been obsoleted by stdlib.h, which is included via hbcomp.h #include +*/ #include "hbcomp.h" diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c index efbf75ccb7..850737474b 100644 --- a/harbour/source/rtl/isprint.c +++ b/harbour/source/rtl/isprint.c @@ -69,7 +69,7 @@ #if defined(HB_OS_WIN_32) && !defined(__RSXNT__) #include - #include +/// #include #include static BOOL IsPrinterError(HANDLE hPrinter); diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index aa2335b05d..5dc601bd37 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -74,9 +74,10 @@ #define INCL_DOSERRORS #define INCL_DOSPROCESS -#ifndef __MPW__ +/* malloc.h has been obsoleted by stdlib.h, which is included via + hbvmpub.h, which is include via hbapi.h #include -#endif +*/ #include "hbapi.h" #include "hbstack.h" diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 3cc3ba1ec6..a1f9a613d6 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -66,9 +66,10 @@ * */ -#ifndef __MPW__ +/* malloc.h has been obsoleted by stdlib.h, which is included via + hbvmpub.h, which is include via hbapi.h #include -#endif +*/ #include #include