Hi Willy,
Please check the attached for a minor bug fix.
The commit log is as below:
[PATCH] 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.
--
Best Regards,
Godbach
From 4639eb27ae2dbe4cd047dcf30c51f9190195b1b5 Mon Sep 17 00:00:00 2001
From: Godbach nylzhao...@gmail.com
Date: Mon, 28 Jul 2014 17:31:57 +0800
Subject: [PATCH] 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 nylzhao...@gmail.com
---
include/proto/server.h |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/proto/server.h b/include/proto/server.h
index 9893266..71c8b13 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
--
1.7.7
