aboutsummaryrefslogtreecommitdiff
path: root/include/compat/dirent_msvc.h
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-08 15:00:09 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-09 06:02:28 -0500
commit5f4e95e7c16a63bbda4f3654126cc81806f779d8 (patch)
tree07ce0a0ee863ae003046746a40c18cee2394422f /include/compat/dirent_msvc.h
parent9903a26661a8b7839bf711167da054a7273d9778 (diff)
downloadportable-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/dirent_msvc.h')
-rw-r--r--include/compat/dirent_msvc.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/compat/dirent_msvc.h b/include/compat/dirent_msvc.h
index bf9cf1a..e5c5c41 100644
--- a/include/compat/dirent_msvc.h
+++ b/include/compat/dirent_msvc.h
@@ -29,15 +29,24 @@
29 29
30#include <windows.h> 30#include <windows.h>
31 31
32#if _MSC_VER >= 1900
33#include <../ucrt/stdio.h>
34#include <../ucrt/wchar.h>
35#include <../ucrt/string.h>
36#include <../ucrt/stdlib.h>
37#include <../ucrt/sys/types.h>
38#include <../ucrt/errno.h>
39#else
32#include <../include/stdio.h> 40#include <../include/stdio.h>
33#include <../include/stdarg.h>
34#include <../include/wchar.h> 41#include <../include/wchar.h>
35#include <../include/string.h> 42#include <../include/string.h>
36#include <../include/stdlib.h> 43#include <../include/stdlib.h>
37#include <../include/malloc.h>
38#include <../include/sys/types.h> 44#include <../include/sys/types.h>
39#include <sys/stat.h>
40#include <../include/errno.h> 45#include <../include/errno.h>
46#endif
47
48#include <stdarg.h>
49#include <sys/stat.h>
41 50
42/* Indicates that d_type field is available in dirent structure */ 51/* Indicates that d_type field is available in dirent structure */
43#define _DIRENT_HAVE_D_TYPE 52#define _DIRENT_HAVE_D_TYPE