Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1410?usp=email
to review the following change.
Change subject: configure/CMake: Unify Windows handling
......................................................................
configure/CMake: Unify Windows handling
Some things were detected in configure.ac and just
hard-coded in CMake. Move the hard-coding to
syshead.h instead and remove the additional code
in configure.ac. These are really Windows-specific
so I think not dynamically detecting is okay.
Change-Id: Ic55e1288b0d3160e68eef07ff4edbb070a03dd31
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M config.h.cmake.in
M configure.ac
M src/openvpn/syshead.h
3 files changed, 29 insertions(+), 83 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/10/1410/1
diff --git a/config.h.cmake.in b/config.h.cmake.in
index f68ea27..bf1388c 100644
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@@ -411,32 +411,3 @@
#ifndef _GNU_SOURCE
# define _GNU_SOURCE 1
#endif
-
-/* if inttypes.h is included this breaks rc.exe when using the ClangCL
- * Toolchain as it pulls in a inttypes.h variant for clang that rc.exe does
- * not understand (#include_next preprocessor directive) */
-#if defined(_WIN32) && !defined(RC_INVOKED)
-#include <inttypes.h>
-typedef uint32_t in_addr_t;
-typedef uint16_t in_port_t;
-
-#define SIGHUP 1
-#define SIGINT 2
-#define SIGUSR1 10
-#define SIGUSR2 12
-#define SIGTERM 15
-#endif
-
-#if defined(_MSC_VER) && !defined(RC_INVOKED)
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#define strncasecmp strnicmp
-#define strcasecmp _stricmp
-
-#define S_IRUSR _S_IREAD
-#define S_IWUSR _S_IWRITE
-#define R_OK 4
-#define W_OK 2
-#define X_OK 1
-#define F_OK 0
-#endif
diff --git a/configure.ac b/configure.ac
index 60799e0..73b388b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,18 +527,6 @@
[[${SOCKET_INCLUDES}]]
)
-AC_CHECK_TYPES(
- [in_addr_t],
- ,
- [AC_DEFINE([in_addr_t], [uint32_t], [Workaround missing in_addr_t])],
- [[${SOCKET_INCLUDES}]]
-)
-AC_CHECK_TYPES(
- [in_port_t],
- ,
- [AC_DEFINE([in_port_t], [uint16_t], [Workaround missing in_port_t])],
- [[${SOCKET_INCLUDES}]]
-)
AC_CHECK_TYPE(
[struct msghdr],
[AC_DEFINE([HAVE_MSGHDR], [1], [struct msghdr needed for extended
socket error support])],
@@ -600,48 +588,6 @@
)
LDFLAGS="$saved_LDFLAGS"
-dnl We emulate signals in Windows
-AC_CHECK_DECLS(
- [SIGHUP],
- ,
- [AC_DEFINE([SIGHUP], [1], [SIGHUP replacement])],
- [[
- #include <signal.h>
- ]]
-)
-AC_CHECK_DECLS(
- [SIGINT],
- ,
- [AC_DEFINE([SIGINT], [2], [SIGINT replacement])],
- [[
- #include <signal.h>
- ]]
-)
-AC_CHECK_DECLS(
- [SIGUSR1],
- ,
- [AC_DEFINE([SIGUSR1], [10], [SIGUSR1 replacement])],
- [[
- #include <signal.h>
- ]]
-)
-AC_CHECK_DECLS(
- [SIGUSR2],
- ,
- [AC_DEFINE([SIGUSR2], [12], [SIGUSR2 replacement])],
- [[
- #include <signal.h>
- ]]
-)
-AC_CHECK_DECLS(
- [SIGTERM],
- ,
- [AC_DEFINE([SIGTERM], [15], [SIGTERM replacement])],
- [[
- #include <signal.h>
- ]]
-)
-
AC_FUNC_FORK
AC_CHECK_FUNCS([ \
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 70ba1fb..724d307 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -44,6 +44,35 @@
#define srandom srand
#endif
+/* if inttypes.h is included this breaks rc.exe when using the ClangCL
+ * Toolchain as it pulls in a inttypes.h variant for clang that rc.exe does
+ * not understand (#include_next preprocessor directive) */
+#if defined(_WIN32) && !defined(RC_INVOKED)
+#include <inttypes.h>
+typedef uint32_t in_addr_t;
+typedef uint16_t in_port_t;
+
+#define SIGHUP 1
+#define SIGINT 2
+#define SIGUSR1 10
+#define SIGUSR2 12
+#define SIGTERM 15
+#endif
+
+#if defined(_MSC_VER) && !defined(RC_INVOKED)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#define strncasecmp strnicmp
+#define strcasecmp _stricmp
+
+#define S_IRUSR _S_IREAD
+#define S_IWUSR _S_IWRITE
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#define F_OK 0
+#endif
+
#if defined(_MSC_VER) && !defined(__clang__) /* Microsoft compiler */
#define __func__ __FUNCTION__
#define __attribute__(x)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1410?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic55e1288b0d3160e68eef07ff4edbb070a03dd31
Gerrit-Change-Number: 1410
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
