From c143c9d71e4795a5b3f6992198aabc7c22335b59 Mon Sep 17 00:00:00 2001 From: lteo <> Date: Thu, 10 Sep 2015 02:23:29 +0000 Subject: Remove SOCKET_PROTOCOL, a redundant define that was only used once. No binary change. ok millert@ miod@ --- src/usr.bin/openssl/s_socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/usr.bin/openssl/s_socket.c') diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c index f9d9e5a899..869211de73 100644 --- a/src/usr.bin/openssl/s_socket.c +++ b/src/usr.bin/openssl/s_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_socket.c,v 1.7 2015/07/20 03:22:25 doug Exp $ */ +/* $OpenBSD: s_socket.c,v 1.8 2015/09/10 02:23:29 lteo Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -77,8 +77,6 @@ static int init_server(int *sock, int port, int type); static int init_server_long(int *sock, int port, char *ip, int type); static int do_accept(int acc_sock, int *sock, char **host); -#define SOCKET_PROTOCOL IPPROTO_TCP - int init_client(int *sock, char *host, char *port, int type, int af) { @@ -187,7 +185,7 @@ init_server_long(int *sock, int port, char *ip, int type) memcpy(&server.sin_addr.s_addr, ip, 4); if (type == SOCK_STREAM) - s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); else /* type == SOCK_DGRAM */ s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -- cgit v1.2.3-55-g6feb