From: Godbach <nylzhaowei@gmail.com>
Date: Mon, 28 Jul 2014 09:31:57 +0000 (+0800)
Subject: BUG/MINOR: server: move the directive #endif to the end of file
X-Git-Tag: v1.6-dev1~345
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e468d55998e134dac1b18d5d9d075ffd5691c827;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: move the directive #endif to the end of file

If a source file includes proto/server.h twice or more, redefinition errors will
be triggered for such inline functions as server_throttle_rate(),
server_is_draining(), srv_adm_set_maint() and so on. Just move #endif directive
to the end of file to solve this issue.

Signed-off-by: Godbach <nylzhaowei@gmail.com>
---

diff --git a/include/proto/server.h b/include/proto/server.h
index 9893266c0c..71c8b1390b 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -54,8 +54,6 @@ static void inline srv_set_sess_last(struct server *s)
 	s->counters.last_sess = now.tv_sec;
 }
 
-#endif /* _PROTO_SERVER_H */
-
 /*
  * Registers the server keyword list <kwl> as a list of valid keywords for next
  * parsing sessions.
@@ -200,6 +198,8 @@ static inline void srv_adm_set_ready(struct server *s)
 	srv_clr_admin_flag(s, SRV_ADMF_FMAINT);
 }
 
+#endif /* _PROTO_SERVER_H */
+
 /*
  * Local variables:
  *  c-indent-level: 8