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

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2016-05-28 23:12:29 -04:00
parent 3ad0772662 51fb028283
commit 1db0ad31c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4ed_mem.cpp
View File

@ -77,7 +77,7 @@ general_memory_check(General_Memory *general){
Bubble *next = bubble->next; Bubble *next = bubble->next;
Assert(bubble == next->prev); Assert(bubble == next->prev);
if (next != sentinel){ if (next != sentinel && bubble->prev != sentinel){
Assert(bubble->next > bubble); Assert(bubble->next > bubble);
Assert(bubble > bubble->prev); Assert(bubble > bubble->prev);

2
linux_4ed.cpp
View File

@ -2214,7 +2214,7 @@ main(int argc, char **argv)
memory_vars.user_memory_size = Mbytes(2); memory_vars.user_memory_size = Mbytes(2);
memory_vars.user_memory = mmap(0, memory_vars.user_memory_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); memory_vars.user_memory = mmap(0, memory_vars.user_memory_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
#endif #endif
String current_directory; String current_directory;
i32 curdir_req, curdir_size; i32 curdir_req, curdir_size;
char *curdir_mem; char *curdir_mem;