summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Haley <johnh@axosoft.com>2015-08-05 10:19:06 -0700
committerJohn Haley <johnh@axosoft.com>2015-08-05 13:02:58 -0700
commiteba784d24d12ad7243708d97d80427bbdc9fd2b7 (patch)
tree3f1c8d36fb0b29c9c443aa89f682d507cae53d49
parentcf716beed2f4729cf01a9822d75b4f1ebf7ccbf1 (diff)
downloadlibgit2-eba784d24d12ad7243708d97d80427bbdc9fd2b7.tar.gz
Fix duplicate basenames to support older VS
With Visual Studio versions 2008 and older they ignore the full path to files and only check the basename of the file to find a collision. Additionally, having duplicate basenames can break other build tools like GYP. This fixes https://github.com/libgit2/libgit2/issues/3356
-rw-r--r--src/path.c2
-rw-r--r--src/util.c2
-rw-r--r--src/win32/w32_buffer.c (renamed from src/win32/buffer.c)3
-rw-r--r--src/win32/w32_buffer.h (renamed from src/win32/buffer.h)0
4 files changed, 3 insertions, 4 deletions
diff --git a/src/path.c b/src/path.c
index 8317aaaa7..9ce5d2978 100644
--- 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/util.c b/src/util.c
index b08b2b884..b3929bca2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -11,7 +11,7 @@
#include "posix.h"
#ifdef GIT_WIN32
-# include "win32/buffer.h"
+# include "win32/w32_buffer.h"
#endif
#ifdef _MSC_VER
diff --git a/src/win32/buffer.c b/src/win32/w32_buffer.c
index 74950189e..9122baaa6 100644
--- a/src/win32/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/buffer.h b/src/win32/w32_buffer.h
index 62243986f..62243986f 100644
--- a/src/win32/buffer.h
+++ b/src/win32/w32_buffer.h