git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build: Make test_{os,parse,dbfn,string} work
[exim.git]
/
src
/
src
/
mytypes.h
diff --git
a/src/src/mytypes.h
b/src/src/mytypes.h
index 36860a892626e4cbe9a6c01a21b880e642d928eb..4d367a95b4b71ac0733e848095ecb2100225f189 100644
(file)
--- 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 *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
15
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-31,10
+29,18
@@
local_scan.h includes it and exim.h includes them both (to get this earlier). */
/* If gcc is being used to compile Exim, we can use its facility for checking
the arguments of printf-like functions. This is done by a macro. */
/* If gcc is being used to compile Exim, we can use its facility for checking
the arguments of printf-like functions. This is done by a macro. */
-#if
def __GNUC__
+#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__))
#else
#define PRINTF_FUNCTION(A,B)
#else
#define PRINTF_FUNCTION(A,B)
+#define ARG_UNUSED /**/
+#endif
+
+#ifdef WANT_DEEPER_PRINTF_CHECKS
+#define ALMOST_PRINTF(A, B) PRINTF_FUNCTION(A, B)
+#else
+#define ALMOST_PRINTF(A, B)
#endif
#endif
@@
-42,8
+48,10
@@
the arguments of printf-like functions. This is done by a macro. */
the standard header files, so we use "uschar". Solaris has u_char in
sys/types.h. This is just a typing convenience, of course. */
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 int BOOL;
typedef unsigned char uschar;
typedef unsigned char uschar;
+typedef int BOOL;
+/* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined
+elsewhere */
/* These macros save typing for the casting that is needed to cope with the
/* These macros save typing for the casting that is needed to cope with the
@@
-58,6
+66,7
@@
almost always literal strings. */
#define US (unsigned char *)
#define CUS (const unsigned char *)
#define USS (unsigned char **)
#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
/* 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