diff --git a/include/common/version.h b/include/haproxy/version.h similarity index 92% rename from include/common/version.h rename to include/haproxy/version.h index b38104f28..446ce5a1a 100644 --- a/include/common/version.h +++ b/include/haproxy/version.h @@ -1,8 +1,8 @@ /* - * include/common/version.h + * include/haproxy/version.h * This file serves as a template for future include files. * - * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu + * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _COMMON_VERSION_H -#define _COMMON_VERSION_H +#ifndef _HAPROXY_VERSION_H +#define _HAPROXY_VERSION_H #include @@ -82,5 +82,5 @@ extern char haproxy_version[]; extern char haproxy_date[]; extern char stats_version_string[]; -#endif /* _COMMON_VERSION_H */ +#endif /* _HAPROXY_VERSION_H */ diff --git a/scripts/create-release b/scripts/create-release index bc87e82c3..b8a867c1f 100755 --- a/scripts/create-release +++ b/scripts/create-release @@ -197,7 +197,7 @@ sed -e "s:Copyright 2000-[0-9]*\s*Willy Tarreau.*>:Copyright 2000-$YEAR Willy Ta echo "Updating version.h ..." sed -e "s:^\(#define\s*PRODUCT_BRANCH\s*\)\"[^\"]*\":\1\"$BRANCH\":" \ - -i include/common/version.h + -i include/haproxy/version.h if [ -n "$INTERACTIVE" ]; then vi CHANGELOG VERSION VERDATE \ diff --git a/src/cli.c b/src/cli.c index 381a9e612..9212651d9 100644 --- a/src/cli.c +++ b/src/cli.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/haproxy.c b/src/haproxy.c index 0e71ba72e..2351aed33 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -94,7 +94,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/http_acl.c b/src/http_acl.c index 5a8c634b2..06c5d71f2 100644 --- a/src/http_acl.c +++ b/src/http_acl.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/src/http_act.c b/src/http_act.c index d116f1d17..1918aa583 100644 --- a/src/http_act.c +++ b/src/http_act.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/http_conv.c b/src/http_conv.c index d83541d34..83c6bb33b 100644 --- a/src/http_conv.c +++ b/src/http_conv.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/http_fetch.c b/src/http_fetch.c index 96c774be6..0ea509c41 100644 --- a/src/http_fetch.c +++ b/src/http_fetch.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/src/http_rules.c b/src/http_rules.c index a2a4e05b4..2661062ee 100644 --- a/src/http_rules.c +++ b/src/http_rules.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/log.c b/src/log.c index 87b12fc38..a8bf820aa 100644 --- a/src/log.c +++ b/src/log.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/mworker.c b/src/mworker.c index f41ee9fa3..95c06bba1 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index a8b78caa4..8a0773c5b 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff --git a/src/proto_uxst.c b/src/proto_uxst.c index d41e1c0a4..e9b85dd88 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include diff --git a/src/stats.c b/src/stats.c index bfe7accb4..8cb1840ea 100644 --- a/src/stats.c +++ b/src/stats.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/version.c b/src/version.c index dae7b3df0..99a85776f 100644 --- a/src/version.c +++ b/src/version.c @@ -4,7 +4,7 @@ * code version. */ -#include +#include /* These ones are made variables and not constants so that they are stored into * the data region and prominently appear in core files.