From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 13 Apr 2008 13:41:36 +0000 (+0200)
Subject: Rely on sys/socket.h for SHUT_*.
X-Git-Tag: gnutls_2_3_5~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f063d565effe40229556d081beca3afd2f41f31;p=thirdparty%2Fgnutls.git

Rely on sys/socket.h for SHUT_*.
---

diff --git a/src/cli.c b/src/cli.c
index 7c32f5692e..be8d0cff2e 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -46,14 +47,6 @@
 #define select _win_select
 #endif
 
-#ifndef SHUT_WR
-# define SHUT_WR 1
-#endif
-
-#ifndef SHUT_RDWR
-# define SHUT_RDWR 2
-#endif
-
 #define SA struct sockaddr
 #define ERR(err,s) do { if (err==-1) {perror(s);return(1);} } while (0)
 #define MAX_BUF 4096
diff --git a/src/tls_test.c b/src/tls_test.c
index 1422a46a91..fc2efcca08 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000,2001,2002,2003,2006,2007 Nikos Mavrogiannopoulos
- * Copyright (C) 2004,2005 Free Software Foundation
+ * Copyright (C) 2004,2005, 2008 Free Software Foundation
  *
  * This file is part of GNUTLS.
  *
@@ -27,18 +27,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/extra.h>
 #include <sys/time.h>
+#include <sys/socket.h>
 #include <tests.h>
 #include <common.h>
 #include <tls_test-gaa.h>
 
-#ifndef SHUT_WR
-# define SHUT_WR 1
-#endif
-
-#ifndef SHUT_RDWR
-# define SHUT_RDWR 2
-#endif
-
 #define SA struct sockaddr
 #define ERR(err,s) if (err==-1) {perror(s);return(1);}
 #define MAX_BUF 4096