From ebf430e133b657303afe916976d8f965bc7ec6e0 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 6 Jan 2004 22:34:58 +0000 Subject: [PATCH] * include/am_defs.h: Don't include malloc.h if stdlib.h exists, because modern systems (e.g., BSD) complain if you use malloc.h instead of stdlib.h. Let's hope there are no systems out there that need both. --- ChangeLog | 7 +++++++ NEWS | 1 + include/am_defs.h | 9 ++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2448d61..2811d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-06 Erez Zadok + + * include/am_defs.h: Don't include malloc.h if stdlib.h exists, + because modern systems (e.g., BSD) complain if you use malloc.h + instead of stdlib.h. Let's hope there are no systems out + there that need both. + 2004-01-05 Erez Zadok * MIRRORS.{txt,html}: verify each mirror site, update to new diff --git a/NEWS b/NEWS index 7439f78..e53bd45 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ ia64-unknown-linux-rh2.1AS (Red Hat Itanium Advanced Server) i386-unknown-freebsd5.0 (5.0-RELEASE) sparc64-unknown-linux-suse7.3 + i386-unknown-freebsd4.9 - bug fixes: rename log() in fsinfo to avoid glibc/gcc-3.3 conflict diff --git a/include/am_defs.h b/include/am_defs.h index c450182..ba18143 100644 --- a/include/am_defs.h +++ b/include/am_defs.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_defs.h,v 1.15.2.14 2004/01/06 03:15:23 ezk Exp $ + * $Id: am_defs.h,v 1.15.2.15 2004/01/06 22:34:58 ezk Exp $ * */ @@ -275,10 +275,13 @@ typedef bool_t (*xdrproc_t) __P ((XDR *, __ptr_t, ...)); /* * Actions to take if exists. + * Don't include malloc.h if stdlib.h exists, because modern + * systems complain if you use malloc.h instead of stdlib.h. + * XXX: let's hope there are no systems out there that need both. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) # include -#endif /* HAVE_MALLOC_H */ +#endif /* defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) */ /* * Actions to take if exists. -- 2.43.0