diff --git a/include/types/mailers.h b/include/haproxy/mailers-t.h similarity index 92% rename from include/types/mailers.h rename to include/haproxy/mailers-t.h index 2b8844298..b2a3ac3e4 100644 --- a/include/types/mailers.h +++ b/include/haproxy/mailers-t.h @@ -1,10 +1,10 @@ /* - * include/types/mailer.h + * include/haproxy/mailer-t.h * This file defines everything related to mailer. * * Copyright 2015 Horms Solutions Ltd., Simon Horman * - * Based on include/types/peers.h + * Based on include/haproxy/peers-t.h * * Copyright 2010 EXCELIANCE, Emeric Brun * @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TYPES_MAILERS_H -#define _TYPES_MAILERS_H +#ifndef _HAPROXY_MAILERS_T_H +#define _HAPROXY_MAILERS_T_H #include #include @@ -61,8 +61,5 @@ struct mailers { } timeout; }; - -extern struct mailers *mailers; - -#endif /* _TYPES_MAILERS_H */ +#endif /* _HAPROXY_MAILERS_T_H */ diff --git a/include/haproxy/mailers.h b/include/haproxy/mailers.h new file mode 100644 index 000000000..5daad862f --- /dev/null +++ b/include/haproxy/mailers.h @@ -0,0 +1,34 @@ +/* + * include/haproxy/mailer.h + * This file lists exported variables and functions for mailers. + * + * Copyright 2015 Horms Solutions Ltd., Simon Horman + * Copyright 2020 Willy Tarreau + * + * Based on include/haproxy/peers-t.h + * + * Copyright 2010 EXCELIANCE, Emeric Brun + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, version 2.1 + * exclusively. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _HAPROXY_MAILERS_H +#define _HAPROXY_MAILERS_H + +#include + +extern struct mailers *mailers; + +#endif /* _HAPROXY_MAILERS_H */ diff --git a/include/proto/checks.h b/include/proto/checks.h index 04c9eeb63..d24943e75 100644 --- a/include/proto/checks.h +++ b/include/proto/checks.h @@ -23,7 +23,7 @@ #define _PROTO_CHECKS_H #include -#include +#include #include const char *get_check_status_description(short check_status); diff --git a/src/cfgparse.c b/src/cfgparse.c index 5302a18cc..011977a0a 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include #include #include diff --git a/src/mailers.c b/src/mailers.c index 4335453b5..601489481 100644 --- a/src/mailers.c +++ b/src/mailers.c @@ -12,6 +12,6 @@ #include -#include +#include struct mailers *mailers = NULL;