Local_scan: more guards in included files

diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 7243f6afcc32506423ab52deecb047168767b92a..206a843eccc25480b109d07aa15856599ae2ad5b 100644 (file)
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -10,6 +10,10 @@ source for the local_scan.c() function. It contains definitions that are made
 available for use in that function, and which are documented.  That source
 should first #define LOCAL_SCAN
 
 available for use in that function, and which are documented.  That source
 should first #define LOCAL_SCAN
 

+Not every definition that becomes available to the compiler by the inclusion
+of this file is part of the local_scan API.  The "Adding a local scan function
+to Exim" chapter in the documentation is definitive.
+

 This API is also used for functions called by the ${dlfunc expansion item.
 Source for those should first #define DLFUNC_IMPL and then include this file.
 Coders of dlfunc routines should read the notes on tainting at the start of
 This API is also used for functions called by the ${dlfunc expansion item.
 Source for those should first #define DLFUNC_IMPL and then include this file.
 Coders of dlfunc routines should read the notes on tainting at the start of

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index 6d2f169b7fc342f9a68679cb87277322bb9e7cc5..a3496a2986634400a00f9f204f4ed643e62f3b7b 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -124,7 +124,7 @@ functions that are called quite often; for other calls to external libraries
 #define Ustrtoul(s,t,b)    strtoul(CCS(s),CSS(t),b)
 #define Uunlink(s)         unlink(CCS(s))
 
 #define Ustrtoul(s,t,b)    strtoul(CCS(s),CSS(t),b)
 #define Uunlink(s)         unlink(CCS(s))
 

-#ifdef EM_VERSION_C
+#if defined(EM_VERSION_C) || defined(LOCAL_SCAN) || defined(DLFUNC_IMPL)

 # define Ustrcat(s,t)       strcat(CS(s), CCS(t))
 # define Ustrcpy(s,t)       strcpy(CS(s), CCS(t))
 # define Ustrncat(s,t,n)    strncat(CS(s), CCS(t), n)
 # define Ustrcat(s,t)       strcat(CS(s), CCS(t))
 # define Ustrcpy(s,t)       strcpy(CS(s), CCS(t))
 # define Ustrncat(s,t,n)    strncat(CS(s), CCS(t), n)