From: Willy Tarreau <w@1wt.eu>
Date: Sun, 20 Sep 2009 18:14:49 +0000 (+0200)
Subject: [BUILD] stream_interface: fix conflicting declaration
X-Git-Tag: v1.3.21~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01300064609d3bc52a533339ac587b9ba8bc8f48;p=thirdparty%2Fhaproxy.git

[BUILD] stream_interface: fix conflicting declaration

stream_int_check_timeouts was declared void while it's an int.

(cherry picked from commit 269358db93458d343584581239cd7118a09a52a0)
---

diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 9a67e813d3..f408f96b6f 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -29,7 +29,7 @@
 
 
 /* main event functions used to move data between sockets and buffers */
-void stream_int_check_timeouts(struct stream_interface *si);
+int stream_int_check_timeouts(struct stream_interface *si);
 void stream_int_report_error(struct stream_interface *si);
 void stream_int_return(struct stream_interface *si, const struct chunk *msg);
 void stream_int_retnclose(struct stream_interface *si, const struct chunk *msg);
diff --git a/src/stream_interface.c b/src/stream_interface.c
index c0c80b6e13..9fa5817330 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -29,6 +29,7 @@
 #include <proto/buffers.h>
 #include <proto/client.h>
 #include <proto/fd.h>
+#include <proto/stream_interface.h>
 #include <proto/stream_sock.h>
 #include <proto/task.h>