Merge branch 'master' into 4.next

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

diff --git a/src/OS/os.h-SunOS5 b/src/OS/os.h-SunOS5
index d0ffd57fdb46ce671bd230b9d83930b21464dd49..45a1171c8c1f632975daff4ebb3a7a99eb1017f2 100644 (file)
--- a/src/OS/os.h-SunOS5
+++ b/src/OS/os.h-SunOS5
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/OS/os.h-SunOS5,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
-

 /* Exim: OS-specific C header file for SunOS5 aka Solaris */
 
 #define CRYPT_H
 /* Exim: OS-specific C header file for SunOS5 aka Solaris */
 
 #define CRYPT_H


@@ -23,11 +21,20 @@
 /* This is needed for some early Solaris releases, but causes trouble
 in the current ones, so it is out by default. */
 
 /* This is needed for some early Solaris releases, but causes trouble
 in the current ones, so it is out by default. */
 

-/* #define SOCKLEN_T               size_t */
+/* #define EXIM_SOCKLEN_T       size_t */

 
 /* This is different from Linux and all other PAM implementations,
 it seems. */
 
 #define PAM_CONVERSE_ARG2_TYPE  struct pam_message
 
 
 /* This is different from Linux and all other PAM implementations,
 it seems. */
 
 #define PAM_CONVERSE_ARG2_TYPE  struct pam_message
 

+
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
+#if _POSIX_C_SOURCE < 200112L
+# define MISSING_UNSETENV_3
+#endif
+
+

 /* End */
 /* End */