Merge from master into 4.next

[exim.git] / src / OS / os.h-BSDI

diff --git a/src/OS/os.h-BSDI b/src/OS/os.h-BSDI
index cb3eeaf9179eeba0643e843ad76a2206991f07bb..a1705ec95be8e03a7104948ff7a5b20a357da0dc 100644 (file)
--- a/src/OS/os.h-BSDI
+++ b/src/OS/os.h-BSDI
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/OS/os.h-BSDI,v 1.3 2006/03/16 12:25:24 ph10 Exp $ */
-
 /* Exim: OS-specific C header file for BSDI */
 
 #define HAVE_BSD_GETLOADAVG
@@ -7,7 +5,11 @@
 #define HAVE_MMAP
 #define HAVE_SYS_MOUNT_H
 #define SIOCGIFCONF_GIVES_ADDR
+#define OS_UNSETENV
 
 typedef struct flock flock_t;
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */