RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Jun-2007 14:51:38
Branch: HEAD Handle: 2007062113513700
Modified files:
rpm system.h
rpm/lib getdate.c getdate.y
Log:
RPM since a longer time no longer checks for the ancient <malloc.h> and
this way there is never a HAVE_MALLOC_H defined, so kick out this stuff
at all. BTW, including the non-POSIX header <malloc.h> on platforms
like FreeBSD even causes an "#error" and this way the build to fail.
The correct way (since more than a decade) is to include <stdlib.h>, of
course.
Summary:
Revision Changes Path
1.12 +0 -4 rpm/lib/getdate.c
1.6 +0 -4 rpm/lib/getdate.y
2.65 +0 -4 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/getdate.c
============================================================================
$ cvs diff -u -r1.11 -r1.12 getdate.c
--- rpm/lib/getdate.c 25 May 2007 17:36:02 -0000 1.11
+++ rpm/lib/getdate.c 21 Jun 2007 12:51:37 -0000 1.12
@@ -194,10 +194,6 @@
#include <stdlib.h>
#endif
-#if HAVE_MALLOC_H && !defined(__LCLINT__)
-#include <malloc.h>
-#endif
-
/* NOTES on rebuilding getdate.c (particularly for inclusion in CVS
releases):
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/getdate.y
============================================================================
$ cvs diff -u -r1.5 -r1.6 getdate.y
--- rpm/lib/getdate.y 25 May 2007 17:36:02 -0000 1.5
+++ rpm/lib/getdate.y 21 Jun 2007 12:51:37 -0000 1.6
@@ -95,10 +95,6 @@
#include <stdlib.h>
#endif
-#if HAVE_MALLOC_H && !defined(__LCLINT__)
-#include <malloc.h>
-#endif
-
/* NOTES on rebuilding getdate.c (particularly for inclusion in CVS
releases):
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.64 -r2.65 system.h
--- rpm/system.h 10 Jun 2007 20:44:42 -0000 2.64
+++ rpm/system.h 21 Jun 2007 12:51:37 -0000 2.65
@@ -291,10 +291,6 @@
#include <err.h>
#endif
-#if HAVE_MALLOC_H && !defined(__LCLINT__)
-#include <malloc.h>
-#endif
-
#if HAVE_LIBGEN_H
#include <libgen.h>
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
