Merge branch '4.next'

[users/heiko/exim.git] / src / OS / os.h-GNU

diff --git a/src/OS/os.h-GNU b/src/OS/os.h-GNU
index 0f8a8d63bcb9f9928ed73ed39c2836e910d61d13..44993163d319da42686679b02a7be987a2741ff2 100644 (file)
--- a/src/OS/os.h-GNU
+++ b/src/OS/os.h-GNU
@@ -2,11 +2,12 @@
 
 #define CRYPT_H
 #define GLIBC_IP_OPTIONS
-#define HAVE_MMAP
 #define HAVE_BSD_GETLOADAVG
+#define HAVE_MMAP
 #define HAVE_SYS_VFS_H
 #define NO_IP_VAR_H
 #define SIG_IGN_WORKS
+#define SIOCGIFCONF_GIVES_ADDR
 
 #define F_FREESP     O_TRUNC
 typedef struct flock flock_t;
@@ -16,4 +17,7 @@ typedef struct flock flock_t;
 
 /* Hurd-specific bits below */
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */