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
Pull strict-aliasing fix for sockaddr_46.
[exim.git]
/
src
/
src
/
mytypes.h
diff --git
a/src/src/mytypes.h
b/src/src/mytypes.h
index 51a4ad49448aac8d938609937beae9df8f796087..5215777f8e369d9409e21e6a12278d5deb133ddf 100644
(file)
--- a/
src/src/mytypes.h
+++ b/
src/src/mytypes.h
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/mytypes.h,v 1.4 2007/01/08 10:50:18 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
7
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-15,19
+13,26
@@
local_scan.h includes it and exim.h includes them both (to get this earlier). */
#ifndef MYTYPES_H
#define MYTYPES_H
#ifndef MYTYPES_H
#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
/* 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__
-#define PRINTF_FUNCTION
__attribute__((format(printf,1,2
)))
+#if
defined(__GNUC__) || defined(__clang__)
+#define PRINTF_FUNCTION
(A,B) __attribute__((format(printf,A,B
)))
#else
#else
-#define PRINTF_FUNCTION
+#define PRINTF_FUNCTION
(A,B)
#endif
#endif
@@
-35,8
+40,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