Hide GnuTLS MinGW push/pull functions when building with OpenSSL

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Feb 6, 2014 · 0b416d8 · 0b416d8
1 parent a651ebb
commit 0b416d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/compat.c b/compat.c
@@ -239,6 +239,7 @@ int openconnect__win32_neterrno()
 	}
 }
 
+#ifdef OPENCONNECT_GNUTLS
 ssize_t openconnect__win32_sock_read(gnutls_transport_ptr_t ptr, void *data, size_t size)
 {
 	return recv((long)ptr, data, size, 0);
@@ -248,4 +249,5 @@ ssize_t openconnect__win32_sock_write(gnutls_transport_ptr_t ptr, const void *da
 {
 	return send((long)ptr, data, size, 0);
 }
+#endif /* OPENCONNECT_GNUTLS */
 #endif /* _WIN32 */
diff --git a/openconnect-internal.h b/openconnect-internal.h
@@ -392,8 +392,10 @@ static inline int set_fd_cloexec(int fd)
 #define pipe(fds) _pipe(fds, 4096, O_BINARY)
 #define neterrno openconnect__win32_neterrno
 int openconnect__win32_neterrno();
+#ifdef OPENCONNECT_GNUTLS
 ssize_t openconnect__win32_sock_read(gnutls_transport_ptr_t ptr, void *data, size_t size);
 ssize_t openconnect__win32_sock_write(gnutls_transport_ptr_t ptr, const void *data, size_t size);
+#endif
 #else
 #define neterrno() errno
 #define closesocket close