Build: workaround inlining problems on Solaris

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index de2371c7d9200c296c90f1001ed22234f29eaa87..7d35fe0d83b29b9a593b67d3f684649b74bc4baa 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -144,28 +144,28 @@ return p >= tainted_base && p < tainted_top;
 
 static inline uschar * __Ustrcat(uschar * dst, const uschar * src, const char * func, int line)
 {
 
 static inline uschar * __Ustrcat(uschar * dst, const uschar * src, const char * func, int line)
 {

-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)

 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcat", CUS func, line);
 #endif
 return US strcat(CS dst, CCS src);
 }
 static inline uschar * __Ustrcpy(uschar * dst, const uschar * src, const char * func, int line)
 {
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcat", CUS func, line);
 #endif
 return US strcat(CS dst, CCS src);
 }
 static inline uschar * __Ustrcpy(uschar * dst, const uschar * src, const char * func, int line)
 {

-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)

 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcpy", CUS func, line);
 #endif
 return US strcpy(CS dst, CCS src);
 }
 static inline uschar * __Ustrncat(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrcpy", CUS func, line);
 #endif
 return US strcpy(CS dst, CCS src);
 }
 static inline uschar * __Ustrncat(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {

-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)

 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncat", CUS func, line);
 #endif
 return US strncat(CS dst, CCS src, n);
 }
 static inline uschar * __Ustrncpy(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncat", CUS func, line);
 #endif
 return US strncat(CS dst, CCS src, n);
 }
 static inline uschar * __Ustrncpy(uschar * dst, const uschar * src, size_t n, const char * func, int line)
 {

-#ifndef COMPILE_UTILITY
+#if !defined(COMPILE_UTILITY) && !defined(MACRO_PREDEF)

 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncpy", CUS func, line);
 #endif
 return US strncpy(CS dst, CCS src, n);
 if (!is_tainted(dst) && is_tainted(src)) die_tainted(US"Ustrncpy", CUS func, line);
 #endif
 return US strncpy(CS dst, CCS src, n);