Merge branch 'master' into 4.next

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

diff --git a/src/OS/os.h-NetBSD b/src/OS/os.h-NetBSD
index 27e09e3489dd051d69ee4ae012bbe71c0e9b7dc0..d2d3e0d824e55a3c488634578efee9079739de59 100644 (file)
--- a/src/OS/os.h-NetBSD
+++ b/src/OS/os.h-NetBSD
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/OS/os.h-NetBSD,v 1.6 2009/11/16 19:15:36 nm4 Exp $ */
-

 /* Exim: OS-specific C header file for NetBSD */
 
 #define HAVE_BSD_GETLOADAVG
 /* Exim: OS-specific C header file for NetBSD */
 
 #define HAVE_BSD_GETLOADAVG


@@ -14,10 +12,17 @@ typedef struct flock flock_t;
 #define os_strsignal strsignal
 #define OS_STRSIGNAL
 
 #define os_strsignal strsignal
 #define OS_STRSIGNAL
 

+#define os_get_dns_resolver_res __res_get_state
+#define os_put_dns_resolver_res(RP) __res_put_state(RP)
+#define OS_GET_DNS_RESOLVER_RES
+

 #include <sys/param.h>
 
 #if __NetBSD_Version__ >= 299000900
 #define HAVE_SYS_STATVFS_H
 #endif
 
 #include <sys/param.h>
 
 #if __NetBSD_Version__ >= 299000900
 #define HAVE_SYS_STATVFS_H
 #endif
 

+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+

 /* End */
 /* End */