From 823ed29161152a2ddb6370c57358da2c94500891 Mon Sep 17 00:00:00 2001
From: "Cindy Wang (CindyLinz)" <cindylinz@gmail.com>
Date: Sat, 17 May 2014 01:02:14 +0800
Subject: [PATCH 1/2] token.c include r3_str.h for my_strdup & my_strndup

---
 src/token.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/token.c b/src/token.c
index fd47fe9..cebbce9 100644
--- a/src/token.c
+++ b/src/token.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <assert.h>
 #include "str_array.h"
+#include "r3_str.h"
 
 
 str_array * str_array_create(int cap) {

From d5c5a5368f6f5d10086b548448021942e1627e19 Mon Sep 17 00:00:00 2001
From: "Cindy Wang (CindyLinz)" <cindylinz@gmail.com>
Date: Sat, 17 May 2014 02:51:21 +0800
Subject: [PATCH 2/2] avoid redefines

---
 include/r3_define.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/r3_define.h b/include/r3_define.h
index be7b7d3..bee91da 100644
--- a/include/r3_define.h
+++ b/include/r3_define.h
@@ -8,9 +8,15 @@
 #ifndef DEFINE_H
 #define DEFINE_H
 
+#ifndef bool
 typedef unsigned char bool;
-#define FALSE 0
-#define TRUE 1
+#endif
+#ifndef FALSE
+#    define FALSE 0
+#endif
+#ifndef TRUE
+#    define TRUE 1
+#endif
 
 // #define DEBUG 1
 #ifdef DEBUG