diff --git a/src/os_mswin.c b/src/os_mswin.c index 8b507f6fb..95c3d1738 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -498,6 +498,12 @@ slash_adjust(p) } } +#if (_MSC_VER >= 1300) +# define OPEN_OH_ARGTYPE intptr_t +#else +# define OPEN_OH_ARGTYPE long +#endif + static int stat_symlink_aware(const char *name, struct stat *stp) { @@ -533,7 +539,7 @@ stat_symlink_aware(const char *name, struct stat *stp) { int fd, n; - fd = _open_osfhandle((intptr_t)h, _O_RDONLY); + fd = _open_osfhandle((OPEN_OH_ARGTYPE)h, _O_RDONLY); n = _fstat(fd, (struct _stat*)stp); _close(fd); return n; @@ -580,7 +586,7 @@ wstat_symlink_aware(const WCHAR *name, struct _stat *stp) { int fd; - fd = _open_osfhandle((intptr_t)h, _O_RDONLY); + fd = _open_osfhandle((OPEN_OH_ARGTYPE)h, _O_RDONLY); n = _fstat(fd, stp); _close(fd); return n; diff --git a/src/version.c b/src/version.c index 1411943b5..52ad91e1d 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 44, /**/ 43, /**/