Invert default for iconv() 2nd arg type, to match SUSv3. Bug 1161

Probably most of the lesser-used builds are already broken;
this won't fix them

diff --git a/src/OS/os.h-AIX b/src/OS/os.h-AIX
index f3a84f2e3e1d31ce7d2394f050980ec03fa0118d..5cd4501a4f8b86192b3d33a7787f0244d729d902 100644 (file)
--- a/src/OS/os.h-AIX
+++ b/src/OS/os.h-AIX
@@ -20,4 +20,8 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
+
 /* End */

diff --git a/src/OS/os.h-BSDI b/src/OS/os.h-BSDI
index cd91936de27c15e9f563125d5196c6cc932548f8..6e16722fde613c4537602b69bbc95df29c1c6183 100644 (file)
--- a/src/OS/os.h-BSDI
+++ b/src/OS/os.h-BSDI
@@ -8,4 +8,7 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-DGUX b/src/OS/os.h-DGUX
index 838ddd991743d88ff353b36a96ee31fbc69f75cb..9040f0e720dd845388b126ca8de53a94504a07fa 100644 (file)
--- a/src/OS/os.h-DGUX
+++ b/src/OS/os.h-DGUX
@@ -22,4 +22,7 @@ forego the detection of some source-routing based IP attacks. */
 
 #define NO_IP_OPTIONS
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-Darwin b/src/OS/os.h-Darwin
index 559003f537b24b7b9ef3cc255e79a3b0db827385..f4087404e14a8769191741f5543f516aa43343e3 100644 (file)
--- a/src/OS/os.h-Darwin
+++ b/src/OS/os.h-Darwin
@@ -42,4 +42,7 @@ updating Exim to use the newer interface. */
 #define OFF_T_FMT "%lld"
 #define LONGLONG_T long int
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-DragonFly b/src/OS/os.h-DragonFly
index 669bb23274601ae675085d74cfede244b5c8d18f..4c2f1d508b6ac79cc058d4d36297293038d778fe 100644 (file)
--- a/src/OS/os.h-DragonFly
+++ b/src/OS/os.h-DragonFly
@@ -7,4 +7,7 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-FreeBSD b/src/OS/os.h-FreeBSD
index c5ed04275f23fb73765f5d3131daa56d1444c724..ba4889fecab4b9f0cc246452127d3577c61161d6 100644 (file)
--- a/src/OS/os.h-FreeBSD
+++ b/src/OS/os.h-FreeBSD
@@ -10,4 +10,7 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-GNU b/src/OS/os.h-GNU
index cc4da0e3b76f5304d1ade874bad0b7840686b90e..44993163d319da42686679b02a7be987a2741ff2 100644 (file)
--- a/src/OS/os.h-GNU
+++ b/src/OS/os.h-GNU
@@ -17,4 +17,7 @@ typedef struct flock flock_t;
 
 /* Hurd-specific bits below */
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-GNUkFreeBSD b/src/OS/os.h-GNUkFreeBSD
index e60690f71a4260a5455ac47d4b314cb68a245101..ab3503131443dbf29a064473045d04b9e6c4e024 100644 (file)
--- a/src/OS/os.h-GNUkFreeBSD
+++ b/src/OS/os.h-GNUkFreeBSD
@@ -19,4 +19,7 @@ typedef struct flock flock_t;
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-GNUkNetBSD b/src/OS/os.h-GNUkNetBSD
index 121f2d3b3b790bec2c6bd0b1de2a9eefe1dbedde..bc3bc259d7e7ca5090620bb81e7c44bd7ecf5faf 100644 (file)
--- a/src/OS/os.h-GNUkNetBSD
+++ b/src/OS/os.h-GNUkNetBSD
@@ -19,4 +19,7 @@ typedef struct flock flock_t;
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-HI-OSF b/src/OS/os.h-HI-OSF
index 76bd4295dcd01417d497ea50e64bfaee21c63b57..0f50fb66097045da89acd8d8b3fc55d541c127fb 100644 (file)
--- a/src/OS/os.h-HI-OSF
+++ b/src/OS/os.h-HI-OSF
@@ -6,4 +6,7 @@ typedef struct flock           flock_t;
 #define F_FREESP               O_TRUNC
 #define DN_EXPAND_ARG4_TYPE    u_char *
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-HI-UX b/src/OS/os.h-HI-UX
index 97b83edf1ce0cfacc54e1fba1a65a58cb8d33817..f3df9638c50780eb8cff051ee90d612aeceffbbb 100644 (file)
--- a/src/OS/os.h-HI-UX
+++ b/src/OS/os.h-HI-UX
@@ -15,4 +15,7 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-HP-UX b/src/OS/os.h-HP-UX
index 87e4dfc97758d829ba9a96c7371761418dd302ed..3359204bd42b2b62f19bda1e1af6fda4e7c6dfa0 100644 (file)
--- a/src/OS/os.h-HP-UX
+++ b/src/OS/os.h-HP-UX
@@ -1,6 +1,5 @@
 /* Exim: OS-specific C header file for HP-UX versions greater than 9 */
 
-#define ICONV_ARG2_TYPE char **
 #define EXIM_SOCKLEN_T size_t
 
 #define LOAD_AVG_NEEDS_ROOT

diff --git a/src/OS/os.h-HP-UX-9 b/src/OS/os.h-HP-UX-9
index dab965e3bebc787b3b351ad9ab5be7f039acc2fa..5a260d607ad9107c1c629fa0d3dc007efcbf1173 100644 (file)
--- a/src/OS/os.h-HP-UX-9
+++ b/src/OS/os.h-HP-UX-9
@@ -17,4 +17,7 @@
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-IRIX b/src/OS/os.h-IRIX
index ac5a6b3263b951b841cc517b42040b336a7cf852..1d4bf46baa4e320ab551e7b5a3148fd170c926a7 100644 (file)
--- a/src/OS/os.h-IRIX
+++ b/src/OS/os.h-IRIX
@@ -14,7 +14,4 @@
 #define F_FAVAIL        f_favail
 #define vfork fork
 
-/* Other OS have "const" in here */
-#define ICONV_ARG2_TYPE char **
-
 /* End */

diff --git a/src/OS/os.h-IRIX6 b/src/OS/os.h-IRIX6
index c41a2342459cb30da4c085f292afaf7cb7b5d73f..bf3076713f376bc140c5f3d3dc5cc0d0947cb30e 100644 (file)
--- a/src/OS/os.h-IRIX6
+++ b/src/OS/os.h-IRIX6
@@ -13,7 +13,4 @@
 #define F_FAVAIL        f_favail
 #define vfork fork
 
-/* Other OS have "const" in here */
-#define ICONV_ARG2_TYPE char **
-
 /* End */

diff --git a/src/OS/os.h-IRIX632 b/src/OS/os.h-IRIX632
index 0196931d24ab4e0f329112983ebb82571d572c77..90f1c582c3272fa35eb876c4e4445e4b4b5ad6a1 100644 (file)
--- a/src/OS/os.h-IRIX632
+++ b/src/OS/os.h-IRIX632
@@ -15,7 +15,4 @@
 #define F_FAVAIL        f_favail
 #define vfork fork
 
-/* Other OS have "const" in here */
-#define ICONV_ARG2_TYPE char **
-
 /* End */

diff --git a/src/OS/os.h-IRIX65 b/src/OS/os.h-IRIX65
index 683c66a9ff93c915ed2c16b4adf42c6f740b0164..4b248fe364a00e57520993c94411c4ab35063547 100644 (file)
--- a/src/OS/os.h-IRIX65
+++ b/src/OS/os.h-IRIX65
@@ -13,7 +13,4 @@
 #define F_FAVAIL        f_favail
 #define vfork fork
 
-/* Other OS have "const" in here */
-#define ICONV_ARG2_TYPE char **
-
 /* End */

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 3fead17d71d24a26c0664957e2eca3c7939bf986..05c153e2c1aa68aacb800b7de2db60195f37453a 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -44,9 +44,6 @@ storage" as quickly as Exim thinks they are. */
 
 #define NEED_SYNC_DIRECTORY
 
-/* Other OS have "const" in here */
-#define ICONV_ARG2_TYPE char **
-
 #define os_find_running_interfaces os_find_running_interfaces_linux
 
 /* Need a prototype for the Linux-specific function. The structure hasn't

diff --git a/src/OS/os.h-NetBSD b/src/OS/os.h-NetBSD
index 19a8ac0c7028de2eeaa514acf2f0190b78e54637..d2d3e0d824e55a3c488634578efee9079739de59 100644 (file)
--- a/src/OS/os.h-NetBSD
+++ b/src/OS/os.h-NetBSD
@@ -22,4 +22,7 @@ typedef struct flock flock_t;
 #define HAVE_SYS_STATVFS_H
 #endif
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-OSF1 b/src/OS/os.h-OSF1
index f04a5b7000007342853b4566b14e8c22a981224c..6b5fa497319937d5643f80770528ab5fa62c1e92 100644 (file)
--- a/src/OS/os.h-OSF1
+++ b/src/OS/os.h-OSF1
@@ -13,7 +13,4 @@ changed. */
 /* Still not "socklen_t", which is the most common setting */
 #define EXIM_SOCKLEN_T       int
 
-/* The default for this is "const char **" */
-#define ICONV_ARG2_TYPE      char **
-
 /* End */

diff --git a/src/OS/os.h-OpenBSD b/src/OS/os.h-OpenBSD
index 9578047af72d4b11d236f18d9af1407355cd180d..35eddd5a52fac7eeccfdd17f052bdf245d2cf074 100644 (file)
--- a/src/OS/os.h-OpenBSD
+++ b/src/OS/os.h-OpenBSD
@@ -20,4 +20,7 @@ typedef struct flock flock_t;
 
 typedef struct __res_state *res_state;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-OpenUNIX b/src/OS/os.h-OpenUNIX
index 90be8d56deb51bcb1c26960e94fb304c24037cde..67d1063b0851d841bde5750ce5db55a7ee0c9289 100644 (file)
--- a/src/OS/os.h-OpenUNIX
+++ b/src/OS/os.h-OpenUNIX
@@ -13,4 +13,7 @@
 #define _SVID3
 #define NEED_H_ERRNO
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-QNX b/src/OS/os.h-QNX
index 106b0a61b6a935c36693126aafa7a63c05ae860a..798f799ed96008828ece8ef71c122243c16984ca 100644 (file)
--- a/src/OS/os.h-QNX
+++ b/src/OS/os.h-QNX
@@ -18,4 +18,7 @@ doesn't have/need this header file. From Karsten P. Hoffmann. */
 
 extern int h_errno;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-SCO b/src/OS/os.h-SCO
index 07d21bd94698f5448288d30e0f265bed6f5cc33a..e5e915ed03ed951cfd41b698e7639deb1ac75472 100644 (file)
--- a/src/OS/os.h-SCO
+++ b/src/OS/os.h-SCO
@@ -15,4 +15,7 @@
 #define _SVID3
 #define NEED_H_ERRNO
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-SCO_SV b/src/OS/os.h-SCO_SV
index 486fcbe9441ce785d0e6483da837eb1d75fbdd64..0ca29f74a7458e7668f9e995d5d3ddf3fb9f3c91 100644 (file)
--- a/src/OS/os.h-SCO_SV
+++ b/src/OS/os.h-SCO_SV
@@ -13,4 +13,7 @@
 #define _SVID3
 #define NEED_H_ERRNO
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-SunOS4 b/src/OS/os.h-SunOS4
index b0deefc49f55651f5639a6e3e422b5db057e64b3..65556204c31edd49f357ec3c7f1af9f835368d90 100644 (file)
--- a/src/OS/os.h-SunOS4
+++ b/src/OS/os.h-SunOS4
@@ -33,4 +33,7 @@ flag causes this to get done in exim.h. */
 
 #define FUDGE_GETC_AND_FRIENDS
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-SunOS5 b/src/OS/os.h-SunOS5
index 8bc0799d26858d48e45a3cbd9110b30c09dcb975..dd14f25c8c7655474ebe1313ef22936b2291dec7 100644 (file)
--- a/src/OS/os.h-SunOS5
+++ b/src/OS/os.h-SunOS5
@@ -28,4 +28,7 @@ it seems. */
 
 #define PAM_CONVERSE_ARG2_TYPE  struct pam_message
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-SunOS5-hal b/src/OS/os.h-SunOS5-hal
index 044e09b304fee345c09187eba995874134fd7600..cd9e877a9304955f9b91208895e8500d4c6493eb 100644 (file)
--- a/src/OS/os.h-SunOS5-hal
+++ b/src/OS/os.h-SunOS5-hal
@@ -8,4 +8,7 @@
 #define LOAD_AVG_SYMBOL       "avenrun_1min"
 #define LOAD_AVG_FIELD         value.ul
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-ULTRIX b/src/OS/os.h-ULTRIX
index 9985af263fecee644330ced68c86b72018c90796..08db5aec89cf6e1832a37b80ae40210354f99633 100644 (file)
--- a/src/OS/os.h-ULTRIX
+++ b/src/OS/os.h-ULTRIX
@@ -12,4 +12,7 @@ a minority operating system, easiest just to say "no" until someone asks. */
 #define NO_OPENLOG
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-UNIX_SV b/src/OS/os.h-UNIX_SV
index 9ad824ab766dd8b72a2d4df3ffcae07857248200..4943a07de96af62bdc6356f096e1ea8201f9c50a 100644 (file)
--- a/src/OS/os.h-UNIX_SV
+++ b/src/OS/os.h-UNIX_SV
@@ -19,4 +19,7 @@
 #define _SVID3
 #define NEED_H_ERRNO
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-USG b/src/OS/os.h-USG
index 1c780ee64779e2f14f9abd9af8dd82004c6f8700..e7692206713ba22b73272700026b02b4a3f97973 100644 (file)
--- a/src/OS/os.h-USG
+++ b/src/OS/os.h-USG
@@ -13,4 +13,7 @@
 #define _SVID3
 #define NEED_H_ERRNO
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-Unixware7 b/src/OS/os.h-Unixware7
index 15920949746d2987bd5ea41b81b69a2a288e63e8..4d3ed42f2f20193ce478a176c204554fcbd57079 100644 (file)
--- a/src/OS/os.h-Unixware7
+++ b/src/OS/os.h-Unixware7
@@ -2,7 +2,6 @@
 
 #define NO_SYSEXITS
 
-#define ICONV_ARG2_TYPE char **
 #define EXIM_SOCKLEN_T size_t
 
 #define LOAD_AVG_NEEDS_ROOT

diff --git a/src/OS/os.h-cygwin b/src/OS/os.h-cygwin
index 740300af6758d50612b05b6f75fe20fd97ff56a2..07c14d04d9f32fad0a05a0455b24c41b90c09690 100644 (file)
--- a/src/OS/os.h-cygwin
+++ b/src/OS/os.h-cygwin
@@ -48,4 +48,7 @@ struct  { \
   DWORD SubAuthority[n]; \
 } name = { SID_REVISION, n, {SECURITY_NT_AUTHORITY}, {sid}}
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/OS/os.h-mips b/src/OS/os.h-mips
index 79f3ff25366ed563c4391933973a0ad755958a01..325e3a134203d1f885577cf4d6901f6b0d427541 100644 (file)
--- a/src/OS/os.h-mips
+++ b/src/OS/os.h-mips
@@ -21,4 +21,7 @@ extern char *strerror(int);
 extern int   sys_nerr;
 extern char *sys_errlist[];
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */

diff --git a/src/src/exim.h b/src/src/exim.h
index fb48a43d35718ee3c250d1b5ce08f0bf313bd29c..48cf8c146c9757cbe227bffbbcf72c3ad9720cc1 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -418,7 +418,7 @@ iconv(). It's os.h file defines ICONV_ARG2_TYPE. For the rest, define a default
 here. */
 
 #ifndef ICONV_ARG2_TYPE
-# define ICONV_ARG2_TYPE const char **
+# define ICONV_ARG2_TYPE char **
 #endif
 
 /* One OS uses a different type for the 5th argument of getsockopt */