ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge problem

This commit is contained in:
Allen Webster 2016-11-06 18:19:36 -05:00
parent 6c0015f1ed
commit 62d74a8832
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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:

3
build.cpp
View File

@ -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);