From e84b73370c22ab47fa4abea4a67be4f80047f8ea Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Wed, 24 Nov 2010 12:56:44 -0500
Subject: [PATCH] Avoid conflicting malloc/free declarations in Bison

---
 lib/asn1/asn1parse.y | 4 ++++
 lib/sl/slc-gram.y    | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/asn1/asn1parse.y b/lib/asn1/asn1parse.y
index dad7f67a2..a7a8f3182 100644
--- a/lib/asn1/asn1parse.y
+++ b/lib/asn1/asn1parse.y
@@ -62,6 +62,10 @@ struct string_list {
     struct string_list *next;
 };
 
+/* Declarations for Bison */
+#define YYMALLOC malloc
+#define YYFREE   free
+
 %}
 
 %union {
diff --git a/lib/sl/slc-gram.y b/lib/sl/slc-gram.y
index 0cba8fa3b..79f13684d 100644
--- a/lib/sl/slc-gram.y
+++ b/lib/sl/slc-gram.y
@@ -46,6 +46,12 @@
 #include "slc.h"
 extern FILE *yyin;
 extern struct assignment *assignment;
+
+/* Declarations for Bison:
+ */
+#define YYMALLOC        malloc
+#define YYFREE          free
+
 %}
 
 %union {