diff options
author | Theo Buehler <tb@openbsd.org> | 2023-12-12 08:25:37 +0100 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2023-12-12 08:25:37 +0100 |
commit | 0d8aa3eb214bff12cbf2a1a25890cc6ef398c593 (patch) | |
tree | 4cc804bf5743bfb73108c8103efdb782461afd86 | |
parent | 4ba6cdc48cd9667d5c3690530d8bd9773a290813 (diff) | |
parent | 529f90ddd8f95664e53a818536f093f2d936bd44 (diff) | |
download | portable-0d8aa3eb214bff12cbf2a1a25890cc6ef398c593.tar.gz portable-0d8aa3eb214bff12cbf2a1a25890cc6ef398c593.tar.bz2 portable-0d8aa3eb214bff12cbf2a1a25890cc6ef398c593.zip |
Land #964
-rw-r--r-- | crypto/compat/posix_win.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | include/compat/pthread.h | 0 | ||||
-rw-r--r-- | include/compat/stdio.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c index b3a4687..c7cf6af 100644 --- a/crypto/compat/posix_win.c +++ b/crypto/compat/posix_win.c | |||
@@ -9,8 +9,8 @@ | |||
9 | 9 | ||
10 | #define NO_REDEF_POSIX_FUNCTIONS | 10 | #define NO_REDEF_POSIX_FUNCTIONS |
11 | 11 | ||
12 | #include <windows.h> | ||
13 | #include <ws2tcpip.h> | 12 | #include <ws2tcpip.h> |
13 | #include <windows.h> | ||
14 | 14 | ||
15 | #include <errno.h> | 15 | #include <errno.h> |
16 | #include <fcntl.h> | 16 | #include <fcntl.h> |
diff --git a/include/compat/pthread.h b/include/compat/pthread.h index 1ab011c..1ab011c 100755..100644 --- a/include/compat/pthread.h +++ b/include/compat/pthread.h | |||
diff --git a/include/compat/stdio.h b/include/compat/stdio.h index 4ddd63a..2af8f3e 100644 --- a/include/compat/stdio.h +++ b/include/compat/stdio.h | |||
@@ -44,7 +44,7 @@ int posix_rename(const char *oldpath, const char *newpath); | |||
44 | #define rename(oldpath, newpath) posix_rename(oldpath, newpath) | 44 | #define rename(oldpath, newpath) posix_rename(oldpath, newpath) |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #ifdef _MSC_VER | 47 | #if defined(_MSC_VER) && _MSC_VER < 1900 |
48 | #define snprintf _snprintf | 48 | #define snprintf _snprintf |
49 | #endif | 49 | #endif |
50 | 50 | ||