From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 7 Apr 2011 21:18:01 +0000 (+0200)
Subject: win32 fixes. Patch by LRN.
X-Git-Tag: gnutls_2_99_0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93886329b827485e27e046eae2a8b35531b76e6c;p=thirdparty%2Fgnutls.git

win32 fixes. Patch by LRN.
---

diff --git a/tests/anonself.c b/tests/anonself.c
index 134b88babb..2e30f57fd1 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -33,8 +33,10 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
+#if !defined(_WIN32)
 #include <sys/wait.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index 931962488a..9f0540ebdb 100644
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -32,9 +32,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#if !defined(_WIN32)
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 8d2a48f82d..388385c164 100644
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -31,10 +31,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/openpgp.h>
diff --git a/tests/pskself.c b/tests/pskself.c
index 09001fff4a..b04bd19d6f 100644
--- a/tests/pskself.c
+++ b/tests/pskself.c
@@ -30,10 +30,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
diff --git a/tests/resume.c b/tests/resume.c
index f016c9a50c..60379899d2 100644
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -31,10 +31,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
diff --git a/tests/rng-fork.c b/tests/rng-fork.c
index 1e4b5e531d..c7fc1890b6 100644
--- a/tests/rng-fork.c
+++ b/tests/rng-fork.c
@@ -27,13 +27,16 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <sys/wait.h>
+#endif
 
 #include "utils.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include "../lib/random.h"
 
+#if !defined(_WIN32)
 static void dump(const char* name, unsigned char* buf, int buf_size)
 {
 int i;
@@ -98,3 +101,10 @@ doit (void)
       success("success");
     }
 }
+#else
+void
+doit (void)
+{
+  exit (77);
+}
+#endif
diff --git a/tests/x509dn.c b/tests/x509dn.c
index f1518954cb..cf6cc2ba95 100644
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -31,10 +31,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
diff --git a/tests/x509self.c b/tests/x509self.c
index a25b31ffb1..5cc9157fbc 100644
--- a/tests/x509self.c
+++ b/tests/x509self.c
@@ -31,10 +31,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#if !defined(_WIN32)
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
+#endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>