Merge branch 'master' into 4.next

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

diff --git a/src/OS/os.h-HP-UX b/src/OS/os.h-HP-UX
index 20408151e58f934fa504af3ce17cfe9ade406c26..1b599231dad10ce435625ab8c0a14b4b59346797 100644 (file)
--- a/src/OS/os.h-HP-UX
+++ b/src/OS/os.h-HP-UX
@@ -1,8 +1,5 @@
-/* $Cambridge: exim/src/OS/os.h-HP-UX,v 1.3 2005/06/17 09:02:40 ph10 Exp $ */
-
 /* 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
@@ -13,10 +10,26 @@
 #define FSCALE          1.0
 
 #define HAVE_SYS_STATVFS_H
+#define MISSING_UNSETENV_3
 
 #define F_FREESP           O_TRUNC
 #define NEED_H_ERRNO       1
 
 typedef struct flock flock_t;
 
+typedef struct __res_state *res_state;
+
+#define LLONG_MIN LONG_LONG_MIN
+#define LLONG_MAX LONG_LONG_MAX
+
+#define strtoll(a,b,c) strtoimax(a,b,c)
+
+/* Determined by sockaddr_un */
+
+struct sockaddr_storage
+{
+  short ss_family;
+  char __ss_padding[92];
+};
+
 /* End */