diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:11 -0800 |
commit | 7a4383cf13819cd2ef00f0d60318aad3f1813117 (patch) | |
tree | 7909507115206e773783940871aeb380df778d07 /compat/mingw.h | |
parent | 8102453318caf731ec0fdfa8d9f744a0ac9a44ef (diff) | |
parent | b1b952043f8f909649fdf053c371109c84f9cf56 (diff) | |
download | git-7a4383cf13819cd2ef00f0d60318aad3f1813117.tar.gz |
Merge branch 'rj/cygwin-msvc'
* rj/cygwin-msvc:
MSVC: Add support for building with NO_MMAP
Makefile: keep MSVC and Cygwin configuration separate
Diffstat (limited to 'compat/mingw.h')
-rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 6907345f90..51993ef114 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -187,7 +187,7 @@ int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz); int mingw_rename(const char*, const char*); #define rename mingw_rename -#ifdef USE_WIN32_MMAP +#if defined(USE_WIN32_MMAP) || defined(_MSC_VER) int mingw_getpagesize(void); #define getpagesize mingw_getpagesize #endif |