From: Tim Kientzle <kientzle@gmail.com>
Date: Tue, 6 Jan 2009 05:28:20 +0000 (-0500)
Subject: Merge r376 from trunk: preven Bison from redefining malloc() and free()
X-Git-Tag: v2.6.1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0039104133dcc4bc443dfaa1f3997b7cd1d4204;p=thirdparty%2Flibarchive.git

Merge r376 from trunk: preven Bison from redefining malloc() and free()

SVN-Revision: 377
---

diff --git a/tar/getdate.y b/tar/getdate.y
index 3253f6d68..4627c0c61 100644
--- a/tar/getdate.y
+++ b/tar/getdate.y
@@ -32,6 +32,8 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/getdate.y,v 1.9 2007/07/20 01:27:50 kientzle
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+/* Bison tries to redefine malloc() and free() without the next define. */
+#define	YYINCLUDED_STDLIB_H
 #include <string.h>
 #include <time.h>