From 62d74a88329a45124bc29814023b7eb078f2125f Mon Sep 17 00:00:00 2001
From: Allen Webster <editor@4coder.net>
Date: Sun, 6 Nov 2016 18:19:36 -0500
Subject: [PATCH] merge problem

---
 Makefile  | 2 +-
 build.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 199c7700..0c20fab9 100755
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ package: FLAGS += -DPACKAGE
 package: ../build/build
 
 ../build/build: $(CPP_FILES) $(C_FILES) $(H_FILES)
-	gcc $(WARNINGS) $(FLAGS) build.c -g -o $@
+	gcc $(WARNINGS) $(FLAGS) build.cpp -g -o $@
 	../build/build
 
 clean:
diff --git a/build.cpp b/build.cpp
index 8f2c1d72..7daed229 100644
--- a/build.cpp
+++ b/build.cpp
@@ -716,8 +716,9 @@ static void
 init_global_strings(){
     int32_t size = 1024;
     char *base = (char*)malloc(size);
+    char term_space[1] = {0};
     String builder = make_string_cap(base, 0, size);
-    String term = make_string("\0", 1);
+    String term = make_string_cap(term_space, 1, 1);
     
     META_DIR = get_head(builder);
     append_sc(&builder, D_META_DIR);