Probably not the best place, however, better than syshead.
Signed-off-by: Alon Bar-Lev <[email protected]>
---
src/openvpn/basic.h | 17 +++++++++++++++++
src/openvpn/syshead.h | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/openvpn/basic.h b/src/openvpn/basic.h
index 9746315..ac325e1 100644
--- a/src/openvpn/basic.h
+++ b/src/openvpn/basic.h
@@ -58,4 +58,21 @@
# endif
#endif
+/*
+ * Our socket descriptor type.
+ */
+#ifdef WIN32
+#define SOCKET_UNDEFINED (INVALID_SOCKET)
+typedef SOCKET socket_descriptor_t;
+#else
+#define SOCKET_UNDEFINED (-1)
+typedef int socket_descriptor_t;
+#endif
+
+static inline int
+socket_defined (const socket_descriptor_t sd)
+{
+ return sd != SOCKET_UNDEFINED;
+}
+
#endif
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 3fd955d..657c884 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -392,23 +392,6 @@
#endif
/*
- * Our socket descriptor type.
- */
-#ifdef WIN32
-#define SOCKET_UNDEFINED (INVALID_SOCKET)
-typedef SOCKET socket_descriptor_t;
-#else
-#define SOCKET_UNDEFINED (-1)
-typedef int socket_descriptor_t;
-#endif
-
-static inline int
-socket_defined (const socket_descriptor_t sd)
-{
- return sd != SOCKET_UNDEFINED;
-}
-
-/*
* Should we enable the use of execve() for calling subprocesses,
* instead of system()?
*/
--
1.7.3.4
