Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / src / OS / os.h-OSF1

diff --git a/src/OS/os.h-OSF1 b/src/OS/os.h-OSF1
index 1aa4ff95d725bd30481e322f73836a0a2eaf39ee..f04a5b7000007342853b4566b14e8c22a981224c 100644 (file)
--- a/src/OS/os.h-OSF1
+++ b/src/OS/os.h-OSF1
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/OS/os.h-OSF1,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
-
 /* Exim: OS-specific C header file for OSF1 */
 
 #define HAVE_SYS_MOUNT_H
@@ -8,6 +6,14 @@
 typedef struct flock flock_t;
 #define F_FREESP     O_TRUNC
 
-#define SOCKLEN_T    size_t
+/* This was here for some time, but it seems that now (June 2005) things have
+changed. */
+/* #define EXIM_SOCKLEN_T    size_t */
+
+/* Still not "socklen_t", which is the most common setting */
+#define EXIM_SOCKLEN_T       int
+
+/* The default for this is "const char **" */
+#define ICONV_ARG2_TYPE      char **
 
 /* End */