You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.3 KiB
42 lines
1.3 KiB
From ad65af7dab9b8d8033fd09d8031cc774a6fbf768 Mon Sep 17 00:00:00 2001
|
|
From: Godbach <nylzhaowei@gmail.com>
|
|
Date: Mon, 28 Jul 2014 17:31:57 +0800
|
|
Subject: [PATCH 1/3] 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>
|
|
(cherry picked from commit e468d55998e134dac1b18d5d9d075ffd5691c827)
|
|
---
|
|
include/proto/server.h | 4 ++--
|
|
1 file 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.8.5.5
|
|
|