From 69d0c29b3b45e8f3ea698f75ccc7b5dd9e0099f6 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 27 Jul 2019 15:00:58 +0100 Subject: [PATCH] Build: workaround inlining problems on Solaris --- src/src/mytypes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/mytypes.h b/src/src/mytypes.h index de2371c7d..7d35fe0d8 100644 --- 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) { -#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) { -#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) { -#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) { -#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); -- 2.30.2