diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2016-05-11 10:19:44 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2016-05-11 10:19:44 +0000 |
| commit | 4e579f6c9425c995106fbf72667f4ec7e5d5db85 (patch) | |
| tree | d298bb9fa3cf4f58e328e696a77fadf758a534eb /cpio/cpio_windows.h | |
| parent | 8c8f03ca5b7f1f0d07c23e7c354a45b7c95335f0 (diff) | |
| download | src-4e579f6c9425c995106fbf72667f4ec7e5d5db85.tar.gz src-4e579f6c9425c995106fbf72667f4ec7e5d5db85.zip | |
Update vendor/libarchive/dist to git commit 61c56e5 (post 3.2.0)vendor/libarchive/3.2.0
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=299425
svn path=/vendor/libarchive/3.2.0/; revision=299528; tag=vendor/libarchive/3.2.0
Diffstat (limited to 'cpio/cpio_windows.h')
| -rw-r--r-- | cpio/cpio_windows.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h index 105bf69991de..970a63df663d 100644 --- a/cpio/cpio_windows.h +++ b/cpio/cpio_windows.h @@ -26,6 +26,7 @@ */ #ifndef CPIO_WINDOWS_H #define CPIO_WINDOWS_H 1 +#include <windows.h> #include <io.h> #include <string.h> @@ -35,8 +36,10 @@ #define getpwnam(name) NULL #define getpwuid(id) NULL -#ifdef _MSC_VER -#define snprintf sprintf_s +#if defined(_MSC_VER) + #if _MSC_VER < 1900 + #define snprintf sprintf_s + #endif // _MSC_VER < 1900 #define strdup _strdup #define open _open #define read _read |