Rely on sys/socket.h for SHUT_*.

diff --git a/src/cli.c b/src/cli.c
index 7c32f5692e1a970a066d3d7174d40ffd083ed634..be8d0cff2ea29141b74f8094df78358859fec9da 100644 (file)
--- 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 1422a46a9108419e8307c2cd50ddda0ff4ccceff..fc2efcca08878906b54fe6c2b8fd950389e16e10 100644 (file)
--- 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