From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 6 Jun 2020 07:19:01 +0000 (+0000)
Subject: make the way version.h is included standard (#654)
X-Git-Tag: 4.15-20210522-snapshot~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8d8ff87d890dfc9124d351a0ab133207ba02fdf;p=thirdparty%2Fsquid.git

make the way version.h is included standard (#654)

include guards for version.h are in squid.h
Change this to use the standard approach
---

diff --git a/include/squid.h b/include/squid.h
index 7d122f2cad..953bbd08c1 100644
--- a/include/squid.h
+++ b/include/squid.h
@@ -10,13 +10,8 @@
 #define SQUID_CONFIG_H
 
 #include "autoconf.h"       /* For GNU autoconf variables */
-
-#if !defined(HAVE_SQUID)
-/* sub-packages define their own version details */
 #include "version.h"
 
-#endif
-
 /* default values for listen ports. Usually specified in squid.conf really */
 #define CACHE_HTTP_PORT 3128
 #define CACHE_ICP_PORT 3130
diff --git a/include/version.h b/include/version.h
index 9fc71133d8..a40c17c8fd 100644
--- a/include/version.h
+++ b/include/version.h
@@ -6,6 +6,9 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+#ifndef SQUID_VERSION_H
+#define SQUID_VERSION_H
+
 #ifndef SQUID_RELEASE_TIME
 #define SQUID_RELEASE_TIME squid_curtime
 #endif
@@ -22,3 +25,4 @@
 #define APP_FULLNAME  PACKAGE "/" VERSION
 #endif
 
+#endif /* SQUID_VERSION_H */