test/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94

diff --git a/configure.ac b/configure.ac
index 066679a8e207ac45d347e579dcdb7b19a916fcac..660d2dcc9fc48dc5b46fff5d8aefd049fd28a1ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -715,8 +715,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s
 #endif
 ])
 
-AC_CHECK_TYPES([struct so_linger],
-[#define HAVE_SO_LINGER], ,
+AC_CHECK_TYPES([struct linger],,,
 [
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/test/bench_httpclient.c b/test/bench_httpclient.c
index e15929519dcc1cc8df808f601b665f1d34f1168a..7c7ee470a307e154426ba3419d6c892ac3ca85d8 100644 (file)
--- a/test/bench_httpclient.c
+++ b/test/bench_httpclient.c
@@ -113,13 +113,13 @@ errorcb(struct bufferevent *b, short what, void *arg)
 static void
 frob_socket(evutil_socket_t sock)
 {
-#ifdef HAVE_SO_LINGER
+#ifdef EVENT__HAVE_STRUCT_LINGER
        struct linger l;
 #endif
        int one = 1;
        if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*)&one, sizeof(one))<0)
                perror("setsockopt(SO_REUSEADDR)");
-#ifdef HAVE_SO_LINGER
+#ifdef EVENT__HAVE_STRUCT_LINGER
        l.l_onoff = 1;
        l.l_linger = 0;
        if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&l, sizeof(l))<0)