Report compiler in -d -bV. Clang compat.

Exim successfully builds with clang, albeit with a number of warnings.

 * Our %n usage in printf() calls appears to be correct and safe, AFAICT.
 * dummy functions are, unsurprisingly, unused
 * Valgrind macros cause vociferous complaints
 * Dynamic modules *not* tested

Further clang testing on my part will require an OS update and clang
2.9 to get -rdynamic support.

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index c012fb7d40a70f106ecccd62ecd56a5312327269..56939770d1ae5dd11bec2a8d085679374e28aa41 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -103,8 +103,10 @@ main(int argc, char **argv)
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;
+#if ! (__STDC_VERSION__ >= 199901L)
 size_t test_size_t = 0;
 unsigned long test_ulong_t = 0L;
+#endif
 long test_long_t = 0;
 FILE *base;
 FILE *new;

diff --git a/src/src/exim.c b/src/src/exim.c
index f086a00e852028c56c46649449c7db6ab426343c..3592f30ddce6ddc412dea92ef065c4e462eb353f 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -926,6 +926,21 @@ DEBUG(D_any) do {
 
   int i;
 
+/* clang defines __GNUC__ (at least, for me) so test for it first */
+#if defined(__clang__)
+  fprintf(f, "Compiler: CLang [%s]\n", __clang_version__);
+#elif defined(__GNUC__)
+  fprintf(f, "Compiler: GCC [%s]\n",
+# ifdef __VERSION__
+      __VERSION__
+# else
+      "? unknown version ?"
+# endif
+      );
+#else
+  fprintf(f, "Compiler: <unknown>\n");
+#endif
+
 #ifdef AUTH_CYRUS_SASL
   auth_cyrus_sasl_version_report(f);
 #endif

diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
index b4527a95cd6fab403f62b4545d559205cb2ac960..4a9f01bbea70776430029611cd7f75c844cfb68a 100644 (file)
--- a/src/src/lookups/whoson.c
+++ b/src/src/lookups/whoson.c
@@ -47,7 +47,7 @@ length = length;
 errmsg = errmsg;
 do_cache = do_cache;
 
-switch (wso_query(query, CS buffer, sizeof(buffer)))
+switch (wso_query(CS query, CS buffer, sizeof(buffer)))
   {
   case 0:
   *result = string_copy(buffer);    /* IP in database; return name of user */

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index abf1f53338605d8aa204802383890832629dabfb..7a83da83fadd89d6a321fcc802504ecc8b0df3ec 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -31,7 +31,7 @@ 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. */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #define PRINTF_FUNCTION(A,B)  __attribute__((format(printf,A,B)))
 #else
 #define PRINTF_FUNCTION(A,B)