X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b3c261f710276f28ea23bf86dddacdf5fb4612b4..2c47372fad0f829ddfa29d04095f57a70206469c:/src/src/mytypes.h diff --git a/src/src/mytypes.h b/src/src/mytypes.h index 7a83da83f..2d7134d2b 100644 --- a/src/src/mytypes.h +++ b/src/src/mytypes.h @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/mytypes.h,v 1.7 2009/11/16 19:50:37 nm4 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2017 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -16,15 +14,15 @@ local_scan.h includes it and exim.h includes them both (to get this earlier). */ #define MYTYPES_H #ifndef FALSE -#define FALSE 0 +# define FALSE 0 #endif #ifndef TRUE -#define TRUE 1 +# define TRUE 1 #endif #ifndef TRUE_UNSET -#define TRUE_UNSET 2 +# define TRUE_UNSET 2 #endif @@ -32,9 +30,19 @@ local_scan.h includes it and exim.h includes them both (to get this earlier). */ the arguments of printf-like functions. This is done by a macro. */ #if defined(__GNUC__) || defined(__clang__) -#define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B))) +# define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B))) +# define ARG_UNUSED __attribute__((__unused__)) +# define WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) +#else +# define PRINTF_FUNCTION(A,B) +# define ARG_UNUSED /**/ +# define WARN_UNUSED_RESULT /**/ +#endif + +#ifdef WANT_DEEPER_PRINTF_CHECKS +# define ALMOST_PRINTF(A, B) PRINTF_FUNCTION(A, B) #else -#define PRINTF_FUNCTION(A,B) +# define ALMOST_PRINTF(A, B) #endif @@ -43,7 +51,7 @@ the standard header files, so we use "uschar". Solaris has u_char in sys/types.h. This is just a typing convenience, of course. */ typedef unsigned char uschar; -typedef int BOOL; +typedef unsigned BOOL; /* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined elsewhere */ @@ -60,6 +68,7 @@ almost always literal strings. */ #define US (unsigned char *) #define CUS (const unsigned char *) #define USS (unsigned char **) +#define CUSS (const unsigned char **) /* The C library string functions expect "char *" arguments. Use macros to avoid having to write a cast each time. We do this for string and file