Merge from master into 4.next

[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 87e4dfc97758d829ba9a96c7371761418dd302ed..4998734f6c57917b350d941a152e53380e7effe6 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 */
 
 /* 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
 #define EXIM_SOCKLEN_T size_t
 
 #define LOAD_AVG_NEEDS_ROOT


@@ -24,4 +23,12 @@ typedef struct __res_state *res_state;
 
 #define strtoll(a,b,c) strtoimax(a,b,c)
 
 
 #define strtoll(a,b,c) strtoimax(a,b,c)
 

+/* Determined by sockaddr_un */
+
+struct sockaddr_storage
+{
+  short ss_family;
+  char __ss_padding[92];
+};
+

 /* End */
 /* End */