]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge r376 from trunk: preven Bison from redefining malloc() and free()
authorTim Kientzle <kientzle@gmail.com>
Tue, 6 Jan 2009 05:28:20 +0000 (00:28 -0500)
committerTim Kientzle <kientzle@gmail.com>
Tue, 6 Jan 2009 05:28:20 +0000 (00:28 -0500)
SVN-Revision: 377

tar/getdate.y

index 3253f6d68acfed04ef2c9e7401304e2f9f391726..4627c0c6172e59e15eeb3a4143e807127d5a8e79 100644 (file)
@@ -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>