From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 15 Sep 2024 15:37:58 +0000 (+0100)
Subject: Build: linker quietening (CBMC toolchain).  Bug 3038
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/97dbb3dd270ac1a9c1fb39fb0fa2ba65e878a64f?ds=inline

Build: linker quietening (CBMC toolchain).  Bug 3038
---

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index 315c1d250..3024cd9dd 100644
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -96,13 +96,13 @@ this interface so that this kind of kludge isn't needed. */
 #ifndef NS_MAXMSG
 # define NS_MAXMSG 65535
 #endif
-typedef void * hctx;
 
 #include "local_scan.h"
 #include "path_max.h"
 #include "macros.h"
 #include "structs.h"
 #include "blob.h"
+#include "hash.h"
 #include "globals.h"
 #include "hintsdb.h"
 #include "hintsdb_structs.h"
diff --git a/src/src/globals.h b/src/src/globals.h
index e9be97cd8..5d912254d 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -7,6 +7,9 @@
 /* See the file NOTICE for conditions of use and distribution. */
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#ifndef GLOBALS_H
+#define GLOBALS_H
+
 /* Almost all the global variables are defined together in this one header, so
 that they are easy to find. However, those that are visible during the
 compilation of the local_scan() function are defined separately in the
@@ -1104,4 +1107,5 @@ extern uschar *wellknown_advertise_hosts;/* Allow WELLKNOWN command for specifie
 extern uschar *wellknown_response;     /* SMTP response for WELLKNOWN verb */
 #endif
 
+#endif	/* whole file */
 /* End of globals.h */
diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 11f271d1b..afbd22dbc 100644
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -22,6 +22,8 @@ Coders of dlfunc routines should read the notes on tainting at the start of
 store.c
 */
 
+#ifndef LOCAL_SCAN_H
+#define LOCAL_SCAN_H
 
 /* Some basic types that make some things easier, the Exim configuration
 settings, and the store functions. */
@@ -247,4 +249,5 @@ extern pid_t    child_open_exim2_function(int *, uschar *, uschar *, const uscha
 extern pid_t    child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
 #endif
 
+#endif	/* whole file */
 /* End of local_scan.h */
diff --git a/src/src/macros.h b/src/src/macros.h
index 7bcc7cd04..6acf242c1 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -7,6 +7,8 @@
 /* See the file NOTICE for conditions of use and distribution. */
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#ifndef MACROS_H
+#define MACROS_H
 
 /* These two macros make it possible to obtain the result of macro-expanding
 a string as a text string. This is sometimes useful for debugging output. */
@@ -1214,6 +1216,7 @@ When doing en extended loop of matching, release store periodically. */
 #define GET_OPTION(name) \
   DEBUG(D_expand) debug_printf("try option " name "\n");
 
+#endif	/* whole file */
 /* End of macros.h */
 /* vi: aw ai sw=2
 */
diff --git a/src/src/structs.h b/src/src/structs.h
index ef311b677..a32c55675 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -7,6 +7,8 @@
 /* See the file NOTICE for conditions of use and distribution. */
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#ifndef STRUCTS_H
+#define STRUCTS_H
 
 /* Definitions of various structures. In addition, those that are visible for
 the compilation of local_scan() are defined in local_scan.h. These are
@@ -1038,4 +1040,5 @@ typedef struct misc_module_info {
 
 #define MISC_MODULE_MAGIC	0x4d4d4d31	/* MMM1 */
 
+#endif	/* whole file */
 /* End of structs.h */