windows: MEM_RESERVE, not MAP_RESERVE

3 years ago · df429410f1
parent f86daff3cc
commit df429410f1
1 changed files with 0 additions and 5 deletions
--- a/src/lib/fbuf.h
+++ b/src/lib/fbuf.h
@ -234,11 +234,6 @@ fbuf_emit(fbuf* f, const char* esc){
    return -1;
  }
  if(fbuf_puts(f, esc) < 0){
-<<<<<<< HEAD
-    //logerror("error emitting escape (%s)\n", strerror(errno));
-=======
-    logerror("error emitting escape (%s)\n", strerror(errno));
->>>>>>> 3ddb9554d (merrrge)
    return -1;
  }
  return 0;