Get rid of malloc.h.

This is a non-POSIX/ISO-C header.  It is ok to include this on Linux, but it
is obsolete on BSD; FreeBSD even throws an error if you include it with
__STDC__ defined.  Every system should nowadays have malloc() defined in
stdlib.h.

Diff is largely mechanical, replacing malloc.h with stdlib.h where it is not
yet included anyway.

diff --git a/cde/lib/DtHelp/GifUtils.c b/cde/lib/DtHelp/GifUtils.c
index 4badc9a00e497a0e614a917a4ff3b745ac9718c0..f0a78c44ba3ef1f874dd845666db516c65cee673 100644 (file)
--- a/cde/lib/DtHelp/GifUtils.c
+++ b/cde/lib/DtHelp/GifUtils.c
@@ -67,7 +67,7 @@
 /* include files */
 #include <stdio.h>
 #include <stdarg.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>

diff --git a/cde/lib/DtHelp/Graphics.c b/cde/lib/DtHelp/Graphics.c
index 7f54109d5aa6f1d0b5cb80acb2bcc7a191016889..7631c7669c012e634456c435558c4f26ab96af3f 100644 (file)
--- a/cde/lib/DtHelp/Graphics.c
+++ b/cde/lib/DtHelp/Graphics.c
@@ -85,7 +85,6 @@ static char rcs_id[]="$XConsortium: Graphics.c /main/23 1996/12/06 11:12:54 cde-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <X11/Xlib.h>

diff --git a/cde/lib/DtHelp/JpegUtils.c b/cde/lib/DtHelp/JpegUtils.c
index 9fd96c3d7d78f993f9b5908d806034494cf89f5c..59ef9daef191b97e809222cc8b8011b782ba5336 100644 (file)
--- a/cde/lib/DtHelp/JpegUtils.c
+++ b/cde/lib/DtHelp/JpegUtils.c
@@ -42,7 +42,7 @@
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <setjmp.h>

diff --git a/cde/lib/DtHelp/il/ilhplrotation.c b/cde/lib/DtHelp/il/ilhplrotation.c
index 05d5e87fb83cb49ef938d1921c77b471fcfcf503..c05024c8e25a56bf37bf160248b6c1a4adcbac6a 100644 (file)
--- a/cde/lib/DtHelp/il/ilhplrotation.c
+++ b/cde/lib/DtHelp/il/ilhplrotation.c
@@ -41,8 +41,7 @@ static char version[] = "$XConsortium: ilhplrotation.c /main/3 1995/10/23 15:48:
 static char vdate[] = "$XConsortium: ilhplrotation.c /main/3 1995/10/23 15:48:35 rswiston $";
 
 # include <stdio.h>
-# include <malloc.h>
-/*# include <stdlib.h> */
+# include <stdlib.h>
 # include <math.h>
 # include <limits.h>        /* Get definition of */
 # include <float.h>         /*     FLX_MAX       */

diff --git a/cde/lib/DtSvc/DtUtil1/DbReader.c b/cde/lib/DtSvc/DtUtil1/DbReader.c
index 5916da644f2754419ff272839de76dba60ee6851..e6ac28ee48e85613997b5dcfe31cf20e526ef9f0 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/DbReader.c
+++ b/cde/lib/DtSvc/DtUtil1/DbReader.c
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #include <X11/X.h>

diff --git a/cde/lib/DtSvc/DtUtil1/MMDb.c b/cde/lib/DtSvc/DtUtil1/MMDb.c
index c5b70b6d3593dc8e0e79ba004461b47a23adb1d2..50ffc5913a639ba8708261772b39e4391bf2e19a 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/MMDb.c
+++ b/cde/lib/DtSvc/DtUtil1/MMDb.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 
 #include <unistd.h>
-#include <malloc.h>
 #include <sys/utsname.h>
 #include <stdlib.h>
 

diff --git a/cde/lib/DtSvc/DtUtil1/intarray.c b/cde/lib/DtSvc/DtUtil1/intarray.c
index 044c625245bd9b01e562176a1f0ed683c092b857..f4e31c10b7ba2a3501283ac60c937a7f0fe14239 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/intarray.c
+++ b/cde/lib/DtSvc/DtUtil1/intarray.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "DtHash.h"
 #include "DtShmDb.h"

diff --git a/cde/lib/DtSvc/DtUtil1/inttab.c b/cde/lib/DtSvc/DtUtil1/inttab.c
index 53a7ac596ee40b33c421f6f805fd5b6904d6f2e6..98e43668bee7768776c7ea30a01e467555af26ac 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/inttab.c
+++ b/cde/lib/DtSvc/DtUtil1/inttab.c
@@ -37,7 +37,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <malloc.h>
 #include <string.h>
 #include "DtHash.h"
 #include "DtShmDb.h"

diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h
index 0d878b67fad8c5657f9f8f460e1d0535026f1e40..346f3845543b3bf472bbbc8b544fe23256f0afa9 100644 (file)
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -125,7 +125,7 @@ extern size_t     nl_strlen();              /* __OBSOLETE */
 #if defined(__cplusplus)
 }
 
-#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__)
+#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>

diff --git a/cde/lib/csa/convert2-4.c b/cde/lib/csa/convert2-4.c
index ad7dfc26ce9f2fcff845d1d18639c90dd914706d..9d321521c5f1899ee311254c8465444d15fc495b 100644 (file)
--- a/cde/lib/csa/convert2-4.c
+++ b/cde/lib/csa/convert2-4.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable2.h"

diff --git a/cde/lib/csa/convert3-4.c b/cde/lib/csa/convert3-4.c
index 44e45e7503ad7ac841498f2d82b6d17cd8e7e40a..7bc5c80a84924f24974919e51f35cd52dc86fe49 100644 (file)
--- a/cde/lib/csa/convert3-4.c
+++ b/cde/lib/csa/convert3-4.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable3.h"

diff --git a/cde/lib/csa/convert4-2.c b/cde/lib/csa/convert4-2.c
index 40a6e9733dd4aac3c324270660bd417445b9b60d..782db834ce1f1c48a1c7a0286d5eb16ee2a2a589 100644 (file)
--- a/cde/lib/csa/convert4-2.c
+++ b/cde/lib/csa/convert4-2.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable2.h"

diff --git a/cde/lib/csa/convert4-3.c b/cde/lib/csa/convert4-3.c
index 5009b5b60e741db513eb9f8c3135e60efc2636a4..881fb08220a1a2d08a9d208181f12cf813e69ae8 100644 (file)
--- a/cde/lib/csa/convert4-3.c
+++ b/cde/lib/csa/convert4-3.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable3.h"

diff --git a/cde/lib/pam/libpam/pam_framework.c b/cde/lib/pam/libpam/pam_framework.c
index 16737c464cac70d8471676f9c4937b96e0640987..8824a67d2ba180d84518f124b69e3f90e682db83 100644 (file)
--- a/cde/lib/pam/libpam/pam_framework.c
+++ b/cde/lib/pam/libpam/pam_framework.c
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include <security/pam_appl.h>

diff --git a/cde/lib/pam/libpam/pam_framework_utils.c b/cde/lib/pam/libpam/pam_framework_utils.c
index 7e69c7685eae82899f4d9df3bbb9abfc4c1395df..4e3ff770bf6961e21cf5b990320a7157a3f3e765 100644 (file)
--- a/cde/lib/pam/libpam/pam_framework_utils.c
+++ b/cde/lib/pam/libpam/pam_framework_utils.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <utmpx.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <libintl.h>
 #include <synch.h>

diff --git a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
index cbd4ec74aac6d73e584ddfa88202af29de32950d..dcacf14500a93134e5545881470a5169d547b88c 100644 (file)
--- a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
+++ b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
@@ -82,7 +82,6 @@ typedef union
 # define TT_STRING 290
 # define TT_NUMBER 291
 
-#include <malloc.h>
 #include <memory.h>
 
 #if defined (__hpux)

diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
index c0936d3610c9780ee5a1a959ea0b717b29fd837b..bce0541532395c21f8d9958d1eb5758318a0155f 100644 (file)
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
@@ -54,7 +54,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include <sys/param.h>
 #include <stdlib.h>
 #include <poll.h>

diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
index 4b47d7903e1040f7a1734798d818f9c1eb8bb2fa..b661a805c669831529b320861bb5198f01cb2651 100644 (file)
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
@@ -53,7 +53,7 @@
  */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "CoEdSiteID.h"
 
 CoEdSiteID::

diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
index d90cb5d4bf9150e162627e669ab56a402e54ef50..11d7667babc7bd69e32e6d13f4576371a8ed5778 100644 (file)
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
@@ -55,7 +55,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 #include <limits.h>
 #include "CoEdTextVersion.h"
 #include "CoEdTextChange.h"

diff --git a/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C b/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
index c8315585e1992f9efd703f315a2cb0886325da6d..1af780ace352373aad4adaac1c2c492ada67ec67 100644 (file)
--- a/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
@@ -52,7 +52,7 @@
  * connection with the use or performance of this software.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <memory.h>

diff --git a/cde/lib/tt/lib/api/c/api_storage.h b/cde/lib/tt/lib/api/c/api_storage.h
index dbc03d211fb719c30db5d1b5d100e457361c7aa1..88e222d20f78c72893eaaf785fecbecfa08e9b2f 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_storage.h
+++ b/cde/lib/tt/lib/api/c/api_storage.h
@@ -37,7 +37,6 @@
 #define _API_STORAGE_H
 
 #include <stdlib.h>
-#include <malloc.h>
 #include "util/tt_object.h"
 #include "util/tt_list.h"
 

diff --git a/cde/lib/tt/lib/api/c/api_xdr.C b/cde/lib/tt/lib/api/c/api_xdr.C
index 3d0be8228e62e31ad5d82e4d89ec78deb8f3545d..244ed9f5a96a95411fc5696598bcd6c5610aab2f 100644 (file)
--- a/cde/lib/tt/lib/api/c/api_xdr.C
+++ b/cde/lib/tt/lib/api/c/api_xdr.C
@@ -35,13 +35,10 @@
  */
 
 #include "tt_options.h"
-#if defined(OPT_BUG_SUNOS_4) && defined(__GNUG__)
-#      include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <rpc/rpc.h>
 #include "api/c/api_xdr.h"
 #include <mp/mp_xdr_functions.h>
-#include <malloc.h>
 
 bool_t
 _tt_xdr_cstring_list(XDR *xdrs, char ***ar)

diff --git a/cde/lib/tt/lib/api/dnd/ttdnd.c b/cde/lib/tt/lib/api/dnd/ttdnd.c
index 378cba9df89c28d1eac89c725df93d83591a76d4..256acb4f1d1db537ac1abd0ff50bd59f80f8ba68 100644 (file)
--- a/cde/lib/tt/lib/api/dnd/ttdnd.c
+++ b/cde/lib/tt/lib/api/dnd/ttdnd.c
@@ -33,7 +33,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "api/c/tt_c.h"
 #include "ttdnd.h"
 

diff --git a/cde/lib/tt/lib/mp/mp_desktop.C b/cde/lib/tt/lib/mp/mp_desktop.C
index 41198f8d0ebb881fa01fee467dcf46befa6dbd86..cf5a075a245f49a6664544380588fa215e1f6c1a 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_desktop.C
+++ b/cde/lib/tt/lib/mp/mp_desktop.C
@@ -58,7 +58,7 @@ extern "C" {  extern int ioctl        (int, int, ...) ; };
 #include "mp/mp_desktop.h"
 #include "mp/mp_mp.h"
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "util/tt_gettext.h"
 
 static int parse_Xdisplay_string(_Tt_string display,

diff --git a/cde/lib/tt/lib/mp/mp_mp.C b/cde/lib/tt/lib/mp/mp_mp.C
index 92b9ba8e91fdec763f01769a08f6fbdd35873bfd..9c07114a9f0481ea38ad4c0d06260861be0e4d31 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_mp.C
+++ b/cde/lib/tt/lib/mp/mp_mp.C
@@ -46,7 +46,7 @@
 #include "api/c/api_error.h"
 #include <errno.h>
 #include <sys/resource.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "tt_options.h"
 
 #if defined(_AIX)

diff --git a/cde/lib/tt/lib/util/frozen.tt_trace_gram.c b/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
index 73ffe26f9f2a8ce3d3da0e88ebe60cc2c0ea26a9..a0887f88bc406ff68393d86d48122971e491d3d6 100644 (file)
--- a/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
+++ b/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
@@ -101,7 +101,7 @@ typedef union
 # define _TT_TRACE_LINETERM 280
 # define _TT_TRACE_PARSE_EOF 281
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <memory.h>
 #include <values.h>
 

diff --git a/cde/lib/tt/lib/util/tt_new.C b/cde/lib/tt/lib/util/tt_new.C
index c1fd0080d9402b98f7cb3799b2403f480df670d8..bf7f6001773d7ec9b89340450c2868753e231036 100644 (file)
--- a/cde/lib/tt/lib/util/tt_new.C
+++ b/cde/lib/tt/lib/util/tt_new.C
@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <string.h>
 #include <errno.h>
 #include "util/tt_new.h"

diff --git a/cde/lib/tt/mini_isam/isalloc.c b/cde/lib/tt/mini_isam/isalloc.c
index 2b0bf9ec5b8e1caa38cac9e02b79beae22c0d757..a4d8f2686800bdeaf88c8f12c60cccdf4bbf4503 100644 (file)
--- a/cde/lib/tt/mini_isam/isalloc.c
+++ b/cde/lib/tt/mini_isam/isalloc.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)isalloc.c 1.3 89/07/17 Copyr 1988 Sun Micro";
  */
 
 #include "isam_impl.h"
-#include <malloc.h>
+#include <stdlib.h>
 
 /* strdup is not defined in Ultrix' string.h, so it is implemented in a separate
  * file named strdup.ultrix.c

diff --git a/cde/programs/dtappbuilder/src/libAButil/abio.c b/cde/programs/dtappbuilder/src/libAButil/abio.c
index 0d4564574ca4f0b8edd6c636abdd62069e1e82a9..a1486f6ebfe494bf5cb3f6b9d3a2bbb6b6945d92 100644 (file)
--- a/cde/programs/dtappbuilder/src/libAButil/abio.c
+++ b/cde/programs/dtappbuilder/src/libAButil/abio.c
@@ -69,7 +69,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
-#include <malloc.h>
 #include <assert.h>
 #include <ab_private/util.h>
 #include <ab_private/abio.h>

diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index b0d2ce9a81bbf54479dc3f69e84091a3f4823875..063f09c4bda474fe529dcbbcb15bf899ef45fdc9 100644 (file)
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/param.h>

diff --git a/cde/programs/dtcm/dtcm/props.c b/cde/programs/dtcm/dtcm/props.c
index 01cc908acf200a8d69f41ed337a1da18e3e66349..4f84a7dec6d63a8b9d7db0bd307b7829e9d20347 100644 (file)
--- a/cde/programs/dtcm/dtcm/props.c
+++ b/cde/programs/dtcm/dtcm/props.c
@@ -29,7 +29,6 @@
  */
 
 #include <stdlib.h>
-#include <malloc.h>
 #include <Xm/Xm.h>
 #include <Xm/Form.h>
 #include <Xm/LabelG.h>

diff --git a/cde/programs/dtcm/dtcm/props_pu.c b/cde/programs/dtcm/dtcm/props_pu.c
index 5e84f364186a0291110181dc1e3d5b602eb6a730..747ca9c7d92683a1333fdf99ad94ace408659cae 100644 (file)
--- a/cde/programs/dtcm/dtcm/props_pu.c
+++ b/cde/programs/dtcm/dtcm/props_pu.c
@@ -30,7 +30,6 @@
 
 #include <EUSCompat.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <Xm/Xm.h>

diff --git a/cde/programs/dtcm/libDtCmP/dtfns.c b/cde/programs/dtcm/libDtCmP/dtfns.c
index 3b853542a8e52040be91c4948eb101e5540b305a..74eb7921232aafc848e58f4a7de8d6d9f9947fe0 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/dtfns.c
+++ b/cde/programs/dtcm/libDtCmP/dtfns.c
@@ -72,7 +72,7 @@ static        char sccsid[] = "@(#)dtfns.c 1.3 94/11/07 Copyr 1993 Sun Microsystems, I
 #include <rpcsvc/nislib.h>
 #include <rpcsvc/ypclnt.h>
 #include <dlfcn.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <fns/fns.h>

diff --git a/cde/programs/dtfile/HelpCB.c b/cde/programs/dtfile/HelpCB.c
index 0dd9e2e67ca2aa4c2fda67a6fd52180f0e2a3520..6e2f6340993ab8690f98b02fdfd30ca5443e3d45 100644 (file)
--- a/cde/programs/dtfile/HelpCB.c
+++ b/cde/programs/dtfile/HelpCB.c
@@ -58,7 +58,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
-#include <malloc.h>
 #include <nl_types.h>
 
 #include <Xm/XmP.h>

diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index caf0fc373367f35550982faa257e5fbe6fcd435f..95c9722feda04f00977fdcc4bd84ea445f30f86c 100644 (file)
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -121,7 +121,7 @@
 
 #include <errno.h>
 #include <pwd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #ifndef sun /* don't need the nl_types.h file */

diff --git a/cde/programs/dtfile/SharedMsgs.c b/cde/programs/dtfile/SharedMsgs.c
index 975d891f29ac03ad49239d08a45924533eff0a86..2813bcbb4805559ea255b01cd8e226a6f4c637be 100644 (file)
--- a/cde/programs/dtfile/SharedMsgs.c
+++ b/cde/programs/dtfile/SharedMsgs.c
@@ -51,7 +51,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <pwd.h>
-#include <malloc.h>
 #include <time.h>
 #ifndef sun /* don't need the nl_types.h file */
 #include <nl_types.h>

diff --git a/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c b/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
index 1d3340433a952bdca39a345997f2ae544bd9b3b1..980f88524dd4f7fb0338ab5c511c1d317862a8c3 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
+++ b/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
@@ -27,7 +27,7 @@ static char *version = "$XConsortium: helpcomp.c /main/3 1995/11/08 11:10:34 rsw
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <sys/stat.h>
 

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/build.c b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
index a90d8afc42c4213d480079bbe1eea740a5a4a531..5b763728b53d0fb4bba05e472ba4423163f8eb16 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/build.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
index 6fbf36f113e9fad1acaa01fd39d1674850e351a3..c2e88dda74096e947d3af364dc74a3e192430b23 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
index e55be9204a4b4b85c3469eb339e8da9a9c4aabb0..9f6038d3b314370691b13ed77d1fe1f2586f452c 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
index 8da3c808908ef1a242bd24c3294fbaf4862fb699..00c99e6dee361bb7e479588e8a4d73c0c37ed32f 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/out.c b/cde/programs/dthelp/parser.ccdf/htag/build/out.c
index 2695fffd033a3639ec6928998ee893eb38600c3b..63eb0dbc99e5a4ba0c98bfce674b2b9650a17a2b 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/out.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/param.c b/cde/programs/dthelp/parser.ccdf/htag/build/param.c
index 3329a1539a8f748a6dd55801c7d958f941b2752a..f78f4e008a6c342d9c947e53c50b4ee94f86775f 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/param.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
index b6bc6b1972b2f5e7bde18435e032ed665c16723a..22d45e439ec19946a9f1201c4322365c9b88e7ae 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
index 4372f95f5be392f437ab0cbf823beb5570834beb..903c06e8ba15f951ed175937f1334e95fdcf7315 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 

diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
index 0c75441b0767ffa6d5f455a4693d355e19dcafeb..12daa2a4656eb3c2a4dac36ed559b69adfaff345 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
index 2aa3189bab36f973d01cb5950c497a966b0f6776..504bc37dce07cfd7dc3c950491f7b7e7db2b9be6 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
index 9b82f905e0f37472d762da57aef6a12da1b1383c..b6e232fdeb432193d261db42befc78ae5693b3a3 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
index 1714dc162b8874867a9df861064f6faec48f319b..a44756b1bb00fa4fb3958d31ebede6891bcb8719 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
+++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
@@ -33,17 +33,16 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif
 #include <ctype.h>
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #include <locale.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
index 07db2f91639caf4c507988f78282a684684ef9ee..054c641ce68608ae3a5eb7d44850bf04b99d1d7f 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c b/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
index 9073b91c851d1d2beb14a274498e4e795b58b3ae..3e6b21c638125befcdf1c28e204844b48e2c25d5 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
index 8d36779ee8b52c52061c7008d7d67d6943aac420..3e73f9c6b6c947bfe17fe448af94b1d1159d4b80 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
index 3b9e67179ff0489d40abde4dbb228b305dc474e3..9fc9b535eccb13e5c071a5fe9e94e1f4bdc52944 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
index 11a0a56f8621db2ebd2886e32df0409abedba727..8a838dfb7e1596535402ffb085e1edfe311f875a 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
index d47e5b16cc1f3a06ffb19ca77b61025580c09bfe..0d499ea03cc49147c1513c84673f293b65fc47b4 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
index 9356b540b56395c78188107ab36264e3f017768d..de08887d373b84e2bc1af02d91ff4462269b1401 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
index ec78c241d50182d4265f1c2a56230627c53a834b..c7d9a42eafd4bbbb551ee209902b46c2609fd11b 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
index 6f53b091919614b30ab92f27fcca451c97cb15f5..5c246e4ec1fa4e47d96d20a4de8f049fb9f67da5 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/context.c b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
index 05583ab4c9a8bbe1c006b559d1f5a133d7c0f73e..7423afde586a916987c7b946a6a2a417dfb74d2c 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/util/context.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
index c87b8a54deba8f7e6867b0e8df50660aa8e23e33..1119dbadc9522b8dcc1c46481fec2d006d9fa633 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
index 020333f01fc7c1bfb37ace94af917c3b85e6a20a..a5caae49694e6941f958b0220db2cb1c2d22d000 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
index 6a81b8e39eae7c40e473cade68809cb979910750..820128288e8c05adecde1fe17042cf4aec7d3202 100644 (file)
--- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/build/build.c b/cde/programs/dthelp/parser/canon1/build/build.c
index 72581b40a4acabc4b69b2d65d7e7bf5ef92808bb..b3b1cdf5082034f721a418ecbd0952739cc3f70f 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/build.c
+++ b/cde/programs/dthelp/parser/canon1/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/build/buildutl.c b/cde/programs/dthelp/parser/canon1/build/buildutl.c
index 6e38bea174cd256332dae44294b43642e1458224..5be8b786665219d9d1fcf2e1abbf5d90ec9d655d 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/buildutl.c
+++ b/cde/programs/dthelp/parser/canon1/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/canon1/build/eltree.c b/cde/programs/dthelp/parser/canon1/build/eltree.c
index 0938a44ef3ca6d13a30b5c78eaab2a591609b237..c060204dc060f74d76e7530f8a271b875de572e7 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/eltree.c
+++ b/cde/programs/dthelp/parser/canon1/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */

diff --git a/cde/programs/dthelp/parser/canon1/build/fsa.c b/cde/programs/dthelp/parser/canon1/build/fsa.c
index bec4240746d7657d81014221078dbd50c3a1fedc..f687c132e1442a582868f77bc514c7548a3a4b6f 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/fsa.c
+++ b/cde/programs/dthelp/parser/canon1/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/canon1/build/out.c b/cde/programs/dthelp/parser/canon1/build/out.c
index 8290bce8a7187ac535b60d7091e8d43270be06ca..97414f331f1fffae37094053a9528e49bee10eb0 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/out.c
+++ b/cde/programs/dthelp/parser/canon1/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/build/param.c b/cde/programs/dthelp/parser/canon1/build/param.c
index cca95c60083065f73bb57d66c13a493ab8f4b07a..72dcd7eef825a77a4a80cfb94751a3fc6a900935 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/param.c
+++ b/cde/programs/dthelp/parser/canon1/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"

diff --git a/cde/programs/dthelp/parser/canon1/build/sref.c b/cde/programs/dthelp/parser/canon1/build/sref.c
index ceb8d1598287db65ee489f83a8bb21d563ea2903..caca76dde590d23c83f5e868eef23b935859965a 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/sref.c
+++ b/cde/programs/dthelp/parser/canon1/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"

diff --git a/cde/programs/dthelp/parser/canon1/build/tree.c b/cde/programs/dthelp/parser/canon1/build/tree.c
index 3ec5dadf113c8290b72cf94dfda99a420cc886cd..8c9e001624819d1bc2972c7a759dda56b0aa1679 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/build/tree.c
+++ b/cde/programs/dthelp/parser/canon1/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 

diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
index 89eaba53d89552e49da6dcebfaca85568a690633..94e79122e65f501280525e5894abf12016cd22af 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
index 88d4a6a3c476c5894e917e63e1be57fc99bca7c6..5b5a4d9d39ea63b0e49c80a74c569dd60d58e27f 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/eltdef/entity.c b/cde/programs/dthelp/parser/canon1/eltdef/entity.c
index bfe785c8d9f3938502da11b6e5f3275ecbff7fa0..4aa5cd1f122dd9ef4db02faf4a673861cfb23d2d 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h
index 2e9e26749f00ba770e4360dfcb672bcda3748e6c..fa71c5f808f208484971e279e6aaf5da6309d43e 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/helptag/global.h
+++ b/cde/programs/dthelp/parser/canon1/helptag/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/parser/actutil.c b/cde/programs/dthelp/parser/canon1/parser/actutil.c
index b937ec4b1a1f8f830a8d2b1ee5d3cfa6393f7ab6..f632f82f1a5b7e688d87eb0f87298d0dbb0b1870 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/actutil.c
+++ b/cde/programs/dthelp/parser/canon1/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/parser/delfree.c b/cde/programs/dthelp/parser/canon1/parser/delfree.c
index 2dcf609d394cf9e4ad29353801b0241fe5011a61..34aca5f19169b40bdbfcd345a36eef32e19df45e 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/delfree.c
+++ b/cde/programs/dthelp/parser/canon1/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"

diff --git a/cde/programs/dthelp/parser/canon1/parser/entity.c b/cde/programs/dthelp/parser/canon1/parser/entity.c
index 087fa9bbec10f648fb4aa6645c2d95a8de9b3769..cbe876aed585cd8e3ff9ed3e58c13150e0f89349 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/entity.c
+++ b/cde/programs/dthelp/parser/canon1/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/parser/error.c b/cde/programs/dthelp/parser/canon1/parser/error.c
index 9f7c0f9ef8c2ffa8b2dc9194af03dadd1aa99c6e..80374aac55b92a21236d5220f9992eaa9b811707 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/error.c
+++ b/cde/programs/dthelp/parser/canon1/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/parser/param.c b/cde/programs/dthelp/parser/canon1/parser/param.c
index 573af60279fea6abd12dd3ede3cd6f848ba716c1..28488aa332b67e203f2d496f5db101fba14d0e73 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/param.c
+++ b/cde/programs/dthelp/parser/canon1/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c
index 743385d8d06d2e1362e038aa318d09bdcdb38c13..8cecb2cee6e47ab7855221e0c3450c9b3855d8f7 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/parser.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/canon1/parser/parutil.c b/cde/programs/dthelp/parser/canon1/parser/parutil.c
index 3d4ddd05e12a342315b2eb459498bd961f0e0bc8..b2a609bf036f5eab487baa19720d7fa22b2d180c 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/parutil.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/parser/scan.c b/cde/programs/dthelp/parser/canon1/parser/scan.c
index 51c9a8f1489a5cde2295b9dce3c440513a6a1854..24e5c9ddcfaa5cf3c1b2cd0d039f73db44208cea 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/scan.c
+++ b/cde/programs/dthelp/parser/canon1/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/parser/struct.c b/cde/programs/dthelp/parser/canon1/parser/struct.c
index 20761d92047207a136171050bb20fb575a56f976..c16a9c005de9766deb9df2aed4eaafb9b6b5741a 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/struct.c
+++ b/cde/programs/dthelp/parser/canon1/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/util/context.c b/cde/programs/dthelp/parser/canon1/util/context.c
index 4fa39796e9cf6e3d4675ec095e5a2e11d57db66c..ea8dd6f38794b10934654cd2c18f7d7df4c05911 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/util/context.c
+++ b/cde/programs/dthelp/parser/canon1/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/util/conutil.c b/cde/programs/dthelp/parser/canon1/util/conutil.c
index e0d71c3265a10da242d7099e2900c5f11dd785e3..947cab5fb7e63ae5c8021614b13f268b301505c8 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/util/conutil.c
+++ b/cde/programs/dthelp/parser/canon1/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/util/fclndir.c b/cde/programs/dthelp/parser/canon1/util/fclndir.c
index 66a216285ed6ae477a706dbb4919a62939dc468e..ea7b99b4b2a1b97e0f1652055c8bc61e07133653 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/util/fclndir.c
+++ b/cde/programs/dthelp/parser/canon1/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c
index 6b02080ac8d81a0408277608e031d73e9c483a32..c633fa0bbd14fbba92d61316ad9612a629e3b200 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/util/malloc.c
+++ b/cde/programs/dthelp/parser/canon1/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/build/build.c b/cde/programs/dthelp/parser/pass1/build/build.c
index b42a8f9d108604730b14f2a56778897dfe108a22..5c2239b2509ddc49fad7a2abaeb05bd94ba68138 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/build.c
+++ b/cde/programs/dthelp/parser/pass1/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/build/buildutl.c b/cde/programs/dthelp/parser/pass1/build/buildutl.c
index e330a434aff8a1429119b1313da3778c0378f469..cd071e2e9075beb099423ba44e5db956debc3f82 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/buildutl.c
+++ b/cde/programs/dthelp/parser/pass1/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/pass1/build/eltree.c b/cde/programs/dthelp/parser/pass1/build/eltree.c
index 039f1ff16136554eb888527969c363d14fac7b16..b5c9dba229bda9a56744f901169bed25b48a26a2 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/eltree.c
+++ b/cde/programs/dthelp/parser/pass1/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */

diff --git a/cde/programs/dthelp/parser/pass1/build/fsa.c b/cde/programs/dthelp/parser/pass1/build/fsa.c
index e8e45eb3a4b22ce083e41f091d04ba41468af334..0e9b519e81a35cd17a51ebc6368307fa07918811 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/fsa.c
+++ b/cde/programs/dthelp/parser/pass1/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/pass1/build/out.c b/cde/programs/dthelp/parser/pass1/build/out.c
index 84c1ba00d58ce144fcb12944fdb99899cb0ea9f9..7b4b3ebcd6e54e941eddd6b20d45f031b49604de 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/out.c
+++ b/cde/programs/dthelp/parser/pass1/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/build/param.c b/cde/programs/dthelp/parser/pass1/build/param.c
index 1867dcae06b5750067572d29e6d3ea2414cedd9b..f7250f3e39eb17908bb142c82052be51ff5c351b 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/param.c
+++ b/cde/programs/dthelp/parser/pass1/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"

diff --git a/cde/programs/dthelp/parser/pass1/build/sref.c b/cde/programs/dthelp/parser/pass1/build/sref.c
index 9a37fed825f63bda28da799a3c50db54ede05b09..1e7a67797c58ce4e08fb3533477eb6959b27760f 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/sref.c
+++ b/cde/programs/dthelp/parser/pass1/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"

diff --git a/cde/programs/dthelp/parser/pass1/build/tree.c b/cde/programs/dthelp/parser/pass1/build/tree.c
index ecda8c95f97e558b0d94925aa842f7e14ca88ea8..42db89b8936187e2bfed301067ecb1d249fa55f7 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/build/tree.c
+++ b/cde/programs/dthelp/parser/pass1/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 

diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
index 0ede426a8be3fcc29b4f0757eade86d5c3405d3b..a4358423e084895a16be329a5f5901d04939099f 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
index e178935c4d80d5177a4da6d6bd605cec24348a0f..4dfd87f8093074b749b2236f80ba951033af7c82 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/eltdef/entity.c b/cde/programs/dthelp/parser/pass1/eltdef/entity.c
index 0fc7c5b4dbd2a48ee857bf678aab700190162fbd..4d43047dcfcf7a1098866a7b46bdd12fa68e5a34 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/pass1/helptag/global.h b/cde/programs/dthelp/parser/pass1/helptag/global.h
index c2b8c8325437cecc160cde2cc45c2f5cbbc9289b..79947b3e8cfb1ff76c389c98a38c3719a84dabd9 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/helptag/global.h
+++ b/cde/programs/dthelp/parser/pass1/helptag/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/parser/actutil.c b/cde/programs/dthelp/parser/pass1/parser/actutil.c
index 042b54c5deeec68195a9830cedca8cd4a74b62d5..4e04cd9c4fa9c56e42ac496f5ab63051e2e5e11a 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/actutil.c
+++ b/cde/programs/dthelp/parser/pass1/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/parser/delfree.c b/cde/programs/dthelp/parser/pass1/parser/delfree.c
index 08c419d53b088a6837ef62082b832c734c9439ad..75927304dff17ae25b96a8542dafa05e94043759 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/delfree.c
+++ b/cde/programs/dthelp/parser/pass1/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"

diff --git a/cde/programs/dthelp/parser/pass1/parser/entity.c b/cde/programs/dthelp/parser/pass1/parser/entity.c
index ac38cc4be39afcd04b0cd5cdfea0140df755f666..49810952f2321b720fbdd6e305694bb2b111300f 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/entity.c
+++ b/cde/programs/dthelp/parser/pass1/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/parser/error.c b/cde/programs/dthelp/parser/pass1/parser/error.c
index 97b977da0fe3ae08d74a09f36b1ed3512d26037b..4eba76b5d66d89638497323db86ddd09d2c77d05 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/error.c
+++ b/cde/programs/dthelp/parser/pass1/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/parser/param.c b/cde/programs/dthelp/parser/pass1/parser/param.c
index 629c3223674fb3adecdd7793a43951eaf9e58fd6..7e9367d2333bf3ecb3889db1a71dde9d714f8f0a 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/param.c
+++ b/cde/programs/dthelp/parser/pass1/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.c b/cde/programs/dthelp/parser/pass1/parser/parser.c
index f7ac25a9d7692d69b8bf3e6ad7e13cf8b270213e..d5e801dc8ade7f0b053254fb963ca57af1db1303 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/pass1/parser/parutil.c b/cde/programs/dthelp/parser/pass1/parser/parutil.c
index 32587c320b59eb0c5228d4435369101183a0ce07..8a725a8f75ea2f02adda80cb667d2d3444409277 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/parutil.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/parser/scan.c b/cde/programs/dthelp/parser/pass1/parser/scan.c
index 934118bec4782d27a2242ebea829f22c3a16bf93..971193d9f353432c8abd43dc38019a2205117f4e 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/scan.c
+++ b/cde/programs/dthelp/parser/pass1/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/parser/struct.c b/cde/programs/dthelp/parser/pass1/parser/struct.c
index 497b2a21116a73534397f54751e480a2f124b499..5ceeda6e59c29b9afd8f2255174f29fba5b88164 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/struct.c
+++ b/cde/programs/dthelp/parser/pass1/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/util/context.c b/cde/programs/dthelp/parser/pass1/util/context.c
index fe35848d5d484d1a74dc33fc4e26805088553851..03ea572400767d635a42bed16744b9a7be82bcca 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/util/context.c
+++ b/cde/programs/dthelp/parser/pass1/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/util/conutil.c b/cde/programs/dthelp/parser/pass1/util/conutil.c
index 52e854025df3c3f2b5a1ad3821ae5cf8fc4ad97e..154a0dcb2e4b0cc06ec3ae2ada8193aef373d9c3 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass1/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/util/fclndir.c b/cde/programs/dthelp/parser/pass1/util/fclndir.c
index d5733814cf2174d036ece4103cf49b798936bfdc..2aa2b9a9a37f19112102e1c203334a7958150c4c 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/util/fclndir.c
+++ b/cde/programs/dthelp/parser/pass1/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c
index 8e90eb65d3a1ece67777390adbcfb910316f9870..c8690b8fd1c516b9dc40b8f5fd848caf0ae08703 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass1/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/build/build.c b/cde/programs/dthelp/parser/pass2/build/build.c
index ea67e8748c1f21bb005b5c972497ab37ed84bc2e..5b3d30cc1402da6bc737b7d6e3fa2d7094e89f3e 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/build.c
+++ b/cde/programs/dthelp/parser/pass2/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/build/buildutl.c b/cde/programs/dthelp/parser/pass2/build/buildutl.c
index dac19e7e27be80962afbc99c30d0c50ebafaffee..a2f89913db5c282ec69ded86289413fba0b4177c 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/buildutl.c
+++ b/cde/programs/dthelp/parser/pass2/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/pass2/build/eltree.c b/cde/programs/dthelp/parser/pass2/build/eltree.c
index 245c37347a248740c8e9b82e1b566a236e44ebc4..4ad7f2870a5d7b5cf351d3e30416d78b4d90d103 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/eltree.c
+++ b/cde/programs/dthelp/parser/pass2/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */

diff --git a/cde/programs/dthelp/parser/pass2/build/fsa.c b/cde/programs/dthelp/parser/pass2/build/fsa.c
index 63ec0e7461cfc89db4019e141782d2b807fc7759..b87b8a260ab5d3ab7b996a61f052cae0a2387180 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/fsa.c
+++ b/cde/programs/dthelp/parser/pass2/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"

diff --git a/cde/programs/dthelp/parser/pass2/build/out.c b/cde/programs/dthelp/parser/pass2/build/out.c
index 1137d990013666c09fc6720009460a57b22c57e7..673277d75226ae6ed4e9d580b1a3392ac50bfd0f 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/out.c
+++ b/cde/programs/dthelp/parser/pass2/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/build/param.c b/cde/programs/dthelp/parser/pass2/build/param.c
index d9d4dbbf6875c7941a3aae449033ff0cebe271cd..1bcbd9de4b0d16a54f1b678c74d361a4db34755d 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/param.c
+++ b/cde/programs/dthelp/parser/pass2/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"

diff --git a/cde/programs/dthelp/parser/pass2/build/sref.c b/cde/programs/dthelp/parser/pass2/build/sref.c
index 8c7e67a0177270945e0dde80bafc3db33881d1f1..76ca9e32facb256ef1f86b3c14142d50ac5b0496 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/sref.c
+++ b/cde/programs/dthelp/parser/pass2/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"

diff --git a/cde/programs/dthelp/parser/pass2/build/tree.c b/cde/programs/dthelp/parser/pass2/build/tree.c
index f14816a54d3b9243c7846405a75c09698609905d..1d4e381fb6ff7cf19372b3e806e44ad544971802 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/build/tree.c
+++ b/cde/programs/dthelp/parser/pass2/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 

diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
index cfe42abdb5eb3177c7906bfb3c813597baa24042..5fdb8c262daf6ef0e147b38f8c4f095d8b5a3656 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
index 7c693bf571dd7542f4fbfed962f463312bfbf43a..fc052f8dca09faec2f49b1627c31587d1cd9e7c4 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/eltdef/entity.c b/cde/programs/dthelp/parser/pass2/eltdef/entity.c
index a37855e05c54cec65ac6cfbd84ff512fa4933a4c..f1bee6e2a558e2afad95861fe81d9f8ea5e0d40f 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h
index 5ff444a3d175927ce276615df0eb8af48160e490..3dd0417fefa5ba59dca79c2a9deff6c6ddee78f3 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/htag2/global.h
+++ b/cde/programs/dthelp/parser/pass2/htag2/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/parser/actutil.c b/cde/programs/dthelp/parser/pass2/parser/actutil.c
index ed1f42b48fec88c566e88b6ae807892f65d28eaf..a9adcfc32001f764b563efb2aacd65fad75b47c1 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/actutil.c
+++ b/cde/programs/dthelp/parser/pass2/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/parser/delfree.c b/cde/programs/dthelp/parser/pass2/parser/delfree.c
index 6c07544b780b8587ab6264d3548960061c30e851..4bb49c8ef22df9d01ba13459cfa2fca916f94685 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/delfree.c
+++ b/cde/programs/dthelp/parser/pass2/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"

diff --git a/cde/programs/dthelp/parser/pass2/parser/entity.c b/cde/programs/dthelp/parser/pass2/parser/entity.c
index 3497a94bd72b710528fe5ecac36016cffc4715e8..79544ea9fccdefee256e184f661857ccf2f56ac4 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/entity.c
+++ b/cde/programs/dthelp/parser/pass2/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/parser/error.c b/cde/programs/dthelp/parser/pass2/parser/error.c
index fb213125abcce1ae012238d6b1400ab45e8d6a33..e689f745ebca5659610dda45f51747ec143fae26 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/error.c
+++ b/cde/programs/dthelp/parser/pass2/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/parser/param.c b/cde/programs/dthelp/parser/pass2/parser/param.c
index b97845655105333f90b0fe2cda6aa3352e9facb9..b312070ff927f6762aabac420c446aecce3b248e 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/param.c
+++ b/cde/programs/dthelp/parser/pass2/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c
index 4cdccbb80adac36098af67324aceec6faef149b1..914954d0c9bb738dd5af868a9071aaf49e0fd151 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"

diff --git a/cde/programs/dthelp/parser/pass2/parser/parutil.c b/cde/programs/dthelp/parser/pass2/parser/parutil.c
index 65276f42354a322b26e4ddf812525cbd2b371a99..f2339ce697c96918fc6dfda9c8ed50d51185f61d 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/parutil.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/parser/scan.c b/cde/programs/dthelp/parser/pass2/parser/scan.c
index f2cf30de1ffd682e38f70c4969bc844da723d434..95743f553e4b15acd4975e46950b82501c4aa097 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/scan.c
+++ b/cde/programs/dthelp/parser/pass2/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/parser/struct.c b/cde/programs/dthelp/parser/pass2/parser/struct.c
index aff0f12a5a4fc320caabee65667aa05e964d8311..0c940bd760e993e82c48cb831b333e19f0a63d61 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/struct.c
+++ b/cde/programs/dthelp/parser/pass2/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/util/context.c b/cde/programs/dthelp/parser/pass2/util/context.c
index 9417aefc1a3d11fb01a9f1ffac01187d3e952642..a59f93bed526d93efedd4eef4086040e927c8e79 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/util/context.c
+++ b/cde/programs/dthelp/parser/pass2/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/util/conutil.c b/cde/programs/dthelp/parser/pass2/util/conutil.c
index 9ebc96af7fd13fa2cbbb99871b8741d05fb55b8c..842eadb00c0016c577bdd9fc605986b05b002d08 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass2/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif

diff --git a/cde/programs/dthelp/parser/pass2/util/fclndir.c b/cde/programs/dthelp/parser/pass2/util/fclndir.c
index 28d4759ba0ecfe77a44b2fb98f4a511fb399eda2..fd715f5638584e364cddc3380add679f7544a251 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/util/fclndir.c
+++ b/cde/programs/dthelp/parser/pass2/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c
index ce47d8e73ffa9296a3689d61c13ec3d9afa1540e..a7be15503a7363f688afbda3393fd7267770d4dc 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass2/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>

diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
index 8ff310af0a1aef7a0678c52d53bef4c3f026f548..754b3427ecd398621e75e910c38fd72abdcd3a28 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
@@ -10,7 +10,6 @@ extern "C" {
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 }
 
 #ifdef EXC_DEBUG

diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C b/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
index ae54b534c675e6f02e836239eb877954952b2921..656d5fe22d0296bbcd12e3ed368efdde7afc7afd 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
@@ -46,7 +46,7 @@
 
 #include "../Prelude.h"
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #ifdef SUN_CPP
 #define InitBase(T) \

diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h b/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
index fd01d25651f8c523688d12498596737b05ed569f..03ea10b5049bc39330f81bfd01dff75d7a80b4ab 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
+++ b/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
@@ -24,7 +24,7 @@
 /* This is the module containing common definitions for all modules of */
 /* the CGM Pixmap generator */
 #include <stdio.h>             /* standard I/O package */
-#include <malloc.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>     /* XLib stuff */
 #include <X11/Intrinsic.h>     /* Xt toolkit */
 #include "GraphicsP.h"

diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
index c9bd69b7edddf03bee8a0788f6a6f99864d7b2e8..5223de315af41886a2ceafd0476969bcc874b78d 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
+++ b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
@@ -46,7 +46,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>

diff --git a/cde/programs/dtksh/dtksh.c b/cde/programs/dtksh/dtksh.c
index 454a6d74784fc75fe85069de74e854035a57607c..fdda16e4ff95e930b7fc21eea1a4b44629315210 100644 (file)
--- a/cde/programs/dtksh/dtksh.c
+++ b/cde/programs/dtksh/dtksh.c
@@ -34,7 +34,6 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
-#include <malloc.h>
 
 #define CONSTCHAR (const char *)
 #define TRUE 1

diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index 1f989db27c3aad0c68a6176e62ed5691f48f0237..1a8282863da381995277a6f9c17e71d44ac5fa16 100644 (file)
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -31,7 +31,7 @@
 
 #include       "shell.h" 
 #include <signal.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <nl_types.h>
 #include <X11/X.h>

diff --git a/cde/programs/dtmail/dtmail/MsgHndArray.hh b/cde/programs/dtmail/dtmail/MsgHndArray.hh
index a486dd6254e946b45497ca9906a143bcc2d51cf4..726ac99ea7657c10a43a58fd6c3712096ceb4074 100644 (file)
--- a/cde/programs/dtmail/dtmail/MsgHndArray.hh
+++ b/cde/programs/dtmail/dtmail/MsgHndArray.hh
@@ -26,7 +26,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif

diff --git a/cde/programs/dtmail/libDtMail/Common/Buffer.C b/cde/programs/dtmail/libDtMail/Common/Buffer.C
index d5f5dd6052becb547de8d17379752723b619a908..13fec632f707cb89f080a180bd2c256fbce5080a 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Buffer.C
+++ b/cde/programs/dtmail/libDtMail/Common/Buffer.C
@@ -50,7 +50,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index 12da10157486211e83b41f3882b824257f88f813..d81434c5a76c992848b73b56d75faf7c523781bc 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -60,7 +60,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <string.h>
 #include <pwd.h>
 #include <sys/socket.h>
@@ -90,7 +89,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif