Merge pull request libgit2#3359 from nodegit/maint/v0.23-duplicate-basename-fix

ethomson · ethomson · commit d72914dba6a9 · 2015-08-05T16:27:47.000-05:00
Fix duplicate basenames to support older VS on maint/v0.23
diff --git a/src/path.c b/src/path.c
@@ -10,7 +10,7 @@
 #include "repository.h"
 #ifdef GIT_WIN32
 #include "win32/posix.h"
-#include "win32/buffer.h"
+#include "win32/w32_buffer.h"
 #include "win32/w32_util.h"
 #include "win32/version.h"
 #else
diff --git a/src/win32/w32_buffer.c b/src/win32/w32_buffer.c
@@ -6,7 +6,7 @@
  */
 
 #include "common.h"
-#include "buffer.h"
+#include "w32_buffer.h"
 #include "../buffer.h"
 #include "utf-conv.h"
 
@@ -52,4 +52,3 @@ int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
 	buf->ptr[buf->size] = '\0';
 	return 0;
 }
-
diff --git a/src/win32/w32_buffer.h b/src/win32/w32_buffer.h
