upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 14:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
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>
This commit is contained in:
Godbach 2014-07-28 17:31:57 +08:00 committed by Willy Tarreau
parent 3b9a0c9d4d
commit e468d55998
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/proto/server.h
View file

@ -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