From 5168ff911377853a39c0e777353555e5dd0aa6a4 Mon Sep 17 00:00:00 2001
From: henri <henri@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 22 Apr 2013 19:31:06 +0000
Subject: [PATCH] Moved prototypes to nsock_proxy.h

---
 nsock/src/nsock_proxy.c | 7 +++----
 nsock/src/nsock_proxy.h | 3 +++
 nsock/src/proxy_http.c  | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c
index 07e16f65c..e5fc202fa 100644
--- a/nsock/src/nsock_proxy.c
+++ b/nsock/src/nsock_proxy.c
@@ -85,9 +85,6 @@ static void proxy_parser_delete(struct proxy_parser *parser);
 static struct proxy_node *proxy_node_new(char *proxystr);
 static void proxy_node_delete(struct proxy_node *proxy);
 
-void nsock_proxy_ev_dispatch(nsock_pool nspool, nsock_event nsevent, void *udata);
-void forward_event(mspool *nsp, msevent *nse, void *udata);
-
 
 /* --- Implemented proxy backends --- */
 extern const struct proxy_op proxy_http_ops;
@@ -240,7 +237,9 @@ static void proxy_node_delete(struct proxy_node *proxy) {
     free(proxy);
 }
 
-void forward_event(mspool *nsp, msevent *nse, void *udata) {
+void forward_event(nsock_pool nspool, nsock_event nsevent, void *udata) {
+  mspool *nsp = (mspool *)nspool;
+  msevent *nse = (msevent *)nsevent;
   enum nse_type cached_type;
   enum nse_status cached_status;
  
diff --git a/nsock/src/nsock_proxy.h b/nsock/src/nsock_proxy.h
index 9b67a7608..c4a424fdf 100644
--- a/nsock/src/nsock_proxy.h
+++ b/nsock/src/nsock_proxy.h
@@ -132,6 +132,9 @@ struct proxy_op {
 struct proxy_chain_context *proxy_chain_context_new(nsock_pool nspool);
 void proxy_chain_context_delete(struct proxy_chain_context *ctx);
 
+void nsock_proxy_ev_dispatch(nsock_pool nspool, nsock_event nsevent, void *udata);
+void forward_event(nsock_pool nspool, nsock_event nse, void *udata);
+
 
 #endif /* NSOCK_PROXY_H */
 
diff --git a/nsock/src/proxy_http.c b/nsock/src/proxy_http.c
index 02a0d7523..5d53448dc 100644
--- a/nsock/src/proxy_http.c
+++ b/nsock/src/proxy_http.c
@@ -62,10 +62,6 @@
 #define DEFAULT_PROXY_PORT_HTTP "8080"
 
 
-/* Defined in nsock_proxy.c */
-void nsock_proxy_ev_dispatch(nsock_pool nspool, nsock_event nsevent, void *udata);
-void forward_event(mspool *nsp, msevent *nse, void *udata);
-
 /* --- PROXY INTERFACE PROTOTYPES --- */
 static void proxy_http_init(struct proxy_node *proxy, char *proxystr);
 static void proxy_http_handler(nsock_pool nspool, nsock_event nsevent, void *udata);