diff options
author | Brent Cook <bcook@openbsd.org> | 2015-09-08 15:00:09 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:02:28 -0500 |
commit | 5f4e95e7c16a63bbda4f3654126cc81806f779d8 (patch) | |
tree | 07ce0a0ee863ae003046746a40c18cee2394422f /include/compat/sys | |
parent | 9903a26661a8b7839bf711167da054a7273d9778 (diff) | |
download | portable-5f4e95e7c16a63bbda4f3654126cc81806f779d8.tar.gz portable-5f4e95e7c16a63bbda4f3654126cc81806f779d8.tar.bz2 portable-5f4e95e7c16a63bbda4f3654126cc81806f779d8.zip |
updates for MSVC 2015's degenerate headers
Note that 'perror' moves from stdio.h to stdlib.h, and 'rename' moves
from stdio.h to io.h. Also, standard C includes move from the compiler
to the Windows SDK, which changes the base path for the include files.
Diffstat (limited to 'include/compat/sys')
-rw-r--r-- | include/compat/sys/stat.h | 4 | ||||
-rw-r--r-- | include/compat/sys/types.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/compat/sys/stat.h b/include/compat/sys/stat.h index 9d48251..0e04553 100644 --- a/include/compat/sys/stat.h +++ b/include/compat/sys/stat.h | |||
@@ -11,7 +11,11 @@ | |||
11 | #else | 11 | #else |
12 | 12 | ||
13 | #include <windows.h> | 13 | #include <windows.h> |
14 | #if _MSC_VER >= 1900 | ||
15 | #include <../ucrt/sys/stat.h> | ||
16 | #else | ||
14 | #include <../include/sys/stat.h> | 17 | #include <../include/sys/stat.h> |
18 | #endif | ||
15 | 19 | ||
16 | /* File type and permission flags for stat() */ | 20 | /* File type and permission flags for stat() */ |
17 | #if !defined(S_IFMT) | 21 | #if !defined(S_IFMT) |
diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h index 38dc582..1e9979f 100644 --- a/include/compat/sys/types.h +++ b/include/compat/sys/types.h | |||
@@ -4,7 +4,11 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #ifdef _MSC_VER | 6 | #ifdef _MSC_VER |
7 | #if _MSC_VER >= 1900 | ||
8 | #include <../ucrt/sys/types.h> | ||
9 | #else | ||
7 | #include <../include/sys/types.h> | 10 | #include <../include/sys/types.h> |
11 | #endif | ||
8 | #else | 12 | #else |
9 | #include_next <sys/types.h> | 13 | #include_next <sys/types.h> |
10 | #endif | 14 | #endif |