diff options
| author | Arne Schwabe | 2021-04-22 17:29:36 +0200 |
|---|---|---|
| committer | Gert Doering | 2021-05-03 08:07:25 +0200 |
| commit | 8c18d7c9323084d1b346ea303cf8cfd60d280e56 (patch) | |
| tree | c027e52870fae879182c0de171f333b17e3b610b | |
| parent | 7f600bd39d6e2b034e5a16f65bc639623ff96ae0 (diff) | |
| download | openvpn-8c18d7c9323084d1b346ea303cf8cfd60d280e56.zip openvpn-8c18d7c9323084d1b346ea303cf8cfd60d280e56.tar.gz | |
Move direct.h header where it is used
The direct.h header provides only a handful of functions [1] of which
we only use _wchdir. Directly included the direct.h file where it is
used and remove autoconf magic around it.
[1]
https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-stud
io-2012/as5kw0ze(v=vs.110)?redirectedfrom=MSDN
Patch V2: also remove from config-msvc.h
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20210422152939.2134046-3-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22202.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| -rw-r--r-- | config-msvc.h | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/openvpn/platform.c | 4 | ||||
| -rw-r--r-- | src/openvpn/syshead.h | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/config-msvc.h b/config-msvc.h index 2d5e1a5..9465491 100644 --- a/config-msvc.h +++ b/config-msvc.h @@ -30,7 +30,6 @@ #define HAVE_WINSOCK2_H 1 #define HAVE_WS2TCPIP_H 1 #define HAVE_IO_H 1 -#define HAVE_DIRECT_H 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_LZO_LZO1X_H 1 diff --git a/configure.ac b/configure.ac index 7473251..b830abc 100644 --- a/configure.ac +++ b/configure.ac @@ -414,7 +414,7 @@ AX_TYPE_SOCKLEN_T AC_CHECK_SIZEOF([unsigned int]) AC_CHECK_SIZEOF([unsigned long]) AC_CHECK_HEADERS([ \ - fcntl.h io.h direct.h \ + fcntl.h io.h \ sys/types.h sys/socket.h \ unistd.h dlfcn.h \ netinet/in.h netinet/in_systm.h \ diff --git a/src/openvpn/platform.c b/src/openvpn/platform.c index 45ee545..c63c1d9 100644 --- a/src/openvpn/platform.c +++ b/src/openvpn/platform.c @@ -39,6 +39,10 @@ #include "platform.h" +#if _WIN32 +#include <direct.h> +#endif + /* Redefine the top level directory of the filesystem * to restrict access to files for security */ void diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index e7657b8..42465d0 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -100,10 +100,6 @@ #include <fcntl.h> #endif -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif - #ifdef HAVE_IO_H #include <io.h> #endif |