Commit d72914db by Edward Thomson

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

Fix duplicate basenames to support older VS on maint/v0.23
parents f6dedf2c 2cb4b653
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "repository.h" #include "repository.h"
#ifdef GIT_WIN32 #ifdef GIT_WIN32
#include "win32/posix.h" #include "win32/posix.h"
#include "win32/buffer.h" #include "win32/w32_buffer.h"
#include "win32/w32_util.h" #include "win32/w32_util.h"
#include "win32/version.h" #include "win32/version.h"
#else #else
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include "common.h" #include "common.h"
#include "buffer.h" #include "w32_buffer.h"
#include "../buffer.h" #include "../buffer.h"
#include "utf-conv.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) ...@@ -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'; buf->ptr[buf->size] = '\0';
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment