diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:20:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:20:40 -0700 |
| commit | 9b79956018fafb97da82839148d3ea2acd3e5959 (patch) | |
| tree | 25d7b1a50bc3510a6a6c98ffb44f34e12932a97d /compat | |
| parent | 31ccd35df4b7599c83fe46669ca36ca2c4fb3caa (diff) | |
| parent | e0492c5be123ca264a5477e3481a8a765fe9ae99 (diff) | |
| download | git-9b79956018fafb97da82839148d3ea2acd3e5959.tar.gz | |
Merge branch 'rj/msvc-build'
* rj/msvc-build:
msvc: avoid collisions between "tags" and "TAGS"
msvc: test-svn-fe: Fix linker "unresolved external" error
msvc: Fix build by adding missing symbol defines
msvc: git-daemon: Fix linker "unresolved external" errors
msvc: Fix compilation errors caused by poll.h emulation
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/msvc.h | 2 | ||||
| -rw-r--r-- | compat/vcbuild/include/sys/poll.h | 1 | ||||
| -rw-r--r-- | compat/vcbuild/include/unistd.h | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/compat/msvc.h b/compat/msvc.h index aa4b56315a..96b6d605da 100644 --- a/compat/msvc.h +++ b/compat/msvc.h @@ -12,6 +12,8 @@ #define __attribute__(x) #define strncasecmp _strnicmp #define ftruncate _chsize +#define strtoull _strtoui64 +#define strtoll _strtoi64 static __inline int strcasecmp (const char *s1, const char *s2) { diff --git a/compat/vcbuild/include/sys/poll.h b/compat/vcbuild/include/sys/poll.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/poll.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h index b14fcf94da..c65c2cd566 100644 --- a/compat/vcbuild/include/unistd.h +++ b/compat/vcbuild/include/unistd.h @@ -49,6 +49,9 @@ typedef int64_t off64_t; #define INTMAX_MAX _I64_MAX #define UINTMAX_MAX _UI64_MAX +#define UINT32_MAX 0xffffffff /* 4294967295U */ + +#define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 |