summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVicent Martí <tanoku@gmail.com>2011-06-15 13:47:41 -0700
committerVicent Martí <tanoku@gmail.com>2011-06-15 13:47:41 -0700
commitef9a6f4cbc4aac143279d7eb37909e78fd7c62cc (patch)
treeeff02adf0c805e3d602bd743e91e63689a275160 /src
parentf2bb894e6492f54d52d9c8e3d1d554c05916cf69 (diff)
parent0657e46deef98803058a3c339433a2b6dcafcc13 (diff)
downloadlibgit2-ef9a6f4cbc4aac143279d7eb37909e78fd7c62cc.tar.gz
Merge pull request #261 from Romain-Geissler/discovery-path-v2
Fix: GIT_PATH_PATH_SEPARATOR is now a semi-colon under Windows.
Diffstat (limited to 'src')
-rw-r--r--src/common.h8
-rw-r--r--src/fileops.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/src/common.h b/src/common.h
index c83e00516..b6a6b4d5c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,13 +1,11 @@
#ifndef INCLUDE_common_h__
#define INCLUDE_common_h__
+#include "git2/common.h"
+
/** Force 64 bit off_t size on POSIX. */
#define _FILE_OFFSET_BITS 64
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#define GIT_WIN32 1
-#endif
-
#include "git2/thread-utils.h"
#include "cc-compat.h"
@@ -47,13 +45,11 @@ typedef SSIZE_T ssize_t;
# endif
#endif
-#include "git2/common.h"
#include "git2/types.h"
#include "git2/errors.h"
#include "thread-utils.h"
#include "bswap.h"
-#define GIT_PATH_MAX 4096
extern int git__throw(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
extern int git__rethrow(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
diff --git a/src/fileops.h b/src/fileops.h
index ae8932bd3..953fc732f 100644
--- a/src/fileops.h
+++ b/src/fileops.h
@@ -12,8 +12,6 @@
#include <fcntl.h>
#include <time.h>
-#define GIT_PATH_LIST_SEPARATOR ':'
-
#ifdef GIT_WIN32
#define GIT_PLATFORM_PATH_SEP '\\'
#else