summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-04-13 15:41:36 +0200
committerSimon Josefsson <simon@josefsson.org>2008-04-13 15:41:36 +0200
commit3f063d565effe40229556d081beca3afd2f41f31 (patch)
tree8c6e30ec44d2df1d51d99c812819c5f73d229368
parenteb270b04f38e2c0bc43d5c00c4399d34f64fda51 (diff)
downloadgnutls-3f063d565effe40229556d081beca3afd2f41f31.tar.gz
Rely on sys/socket.h for SHUT_*.
-rw-r--r--src/cli.c9
-rw-r--r--src/tls_test.c11
2 files changed, 3 insertions, 17 deletions
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