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
Merge branch 'master' into 4.next
[exim.git]
/
src
/
src
/
mytypes.h
diff --git
a/src/src/mytypes.h
b/src/src/mytypes.h
index f8a738da6f620ee6cf2af6eea7afc68a26b3050c..a74705739496ed5781f616d24984046dd1a43b1f 100644
(file)
--- a/
src/src/mytypes.h
+++ b/
src/src/mytypes.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
2
*/
+/* Copyright (c) University of Cambridge 1995 - 201
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-14,15
+14,15
@@
local_scan.h includes it and exim.h includes them both (to get this earlier). */
#define MYTYPES_H
#ifndef FALSE
#define MYTYPES_H
#ifndef FALSE
-#define FALSE 0
+#
define FALSE 0
#endif
#ifndef TRUE
#endif
#ifndef TRUE
-#define TRUE 1
+#
define TRUE 1
#endif
#ifndef TRUE_UNSET
#endif
#ifndef TRUE_UNSET
-#define TRUE_UNSET 2
+#
define TRUE_UNSET 2
#endif
#endif
@@
-30,11
+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__)
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 ARG_UNUSED __attribute__((__unused__))
+# define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B)))
+# define ARG_UNUSED __attribute__((__unused__))
+# define WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
#else
#else
-#define PRINTF_FUNCTION(A,B)
-#define ARG_UNUSED /**/
+# 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 ALMOST_PRINTF(A, B)
#endif
#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;
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 */
/* 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 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