diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:55:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:55:36 -0800 |
| commit | b5c6aac01baf9164e08915b348490710e83119f9 (patch) | |
| tree | 4099aab13b34925e45a6b57bb0af30288a22739e /compat | |
| parent | 620b89cd98219db33ce499c7f8e50d091fe9b598 (diff) | |
| parent | 93d85f57be00859f8adecd474da30a7279cd4ec2 (diff) | |
| download | git-b5c6aac01baf9164e08915b348490710e83119f9.tar.gz | |
Merge branch 'rj/msvc-fix'
* rj/msvc-fix:
msvc: Fix macro redefinition warnings
msvc: Fix build by adding missing INTMAX_MAX define
msvc: git-daemon.exe: Fix linker "unresolved externals" error
msvc: Fix compilation errors in compat/win32/sys/poll.c
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.h | 6 | ||||
| -rw-r--r-- | compat/vcbuild/include/unistd.h | 4 | ||||
| -rw-r--r-- | compat/win32/sys/poll.c | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 2283071109..cafc1eb08a 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -14,12 +14,6 @@ typedef int socklen_t; #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK) #define S_ISSOCK(x) 0 -#ifndef _STAT_H_ -#define S_IRUSR 0 -#define S_IWUSR 0 -#define S_IXUSR 0 -#define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR) -#endif #define S_IRGRP 0 #define S_IWGRP 0 #define S_IXGRP 0 diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h index 2a4f276869..b14fcf94da 100644 --- a/compat/vcbuild/include/unistd.h +++ b/compat/vcbuild/include/unistd.h @@ -45,6 +45,10 @@ typedef unsigned long long uintmax_t; typedef int64_t off64_t; +#define INTMAX_MIN _I64_MIN +#define INTMAX_MAX _I64_MAX +#define UINTMAX_MAX _UI64_MAX + #define STDOUT_FILENO 1 #define STDERR_FILENO 2 diff --git a/compat/win32/sys/poll.c b/compat/win32/sys/poll.c index 7e74ebe59a..708a6c9bec 100644 --- a/compat/win32/sys/poll.c +++ b/compat/win32/sys/poll.c @@ -34,6 +34,9 @@ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # define WIN32_NATIVE +# if defined (_MSC_VER) +# define _WIN32_WINNT 0x0502 +# endif # include <winsock2.h> # include <windows.h> # include <io.h> |