Fix mismerge

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

diff --git a/src/OS/os.h-SunOS5 b/src/OS/os.h-SunOS5
index d0ffd57fdb46ce671bd230b9d83930b21464dd49..b6c0a2b97754631ceda79f6e6df2aba39e6d029d 100644 (file)
--- a/src/OS/os.h-SunOS5
+++ b/src/OS/os.h-SunOS5
@@ -1,6 +1,6 @@
-/* $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 */
+/* Copyright (c) The Exim Maintainers 2021 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #define CRYPT_H
 #define HAVE_MMAP
@@ -10,6 +10,8 @@
 
 #define HAVE_GETIPNODEBYNAME    1
 #define HAVE_GETIPNODEBYADDR    1
+#define EXIM_HAVE_OPENAT
+#define EXIM_HAVE_FUTIMENS
 
 #define HAVE_KSTAT
 #define LOAD_AVG_KSTAT         "system_misc"
@@ -23,11 +25,36 @@
 /* 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
 
+
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
+#if _POSIX_C_SOURCE < 200112L
+# define MISSING_UNSETENV_3
+#endif
+
+#if _POSIX_C_SOURCE < 200809L
+# define MISSING_POSIX_MEMALIGN
+# define MISSING_POSIX_STPCPY
+#endif
+
+
+/* SunOS5 doesn't accept getcwd(NULL, 0) to auto-allocate
+a buffer */
+
+#define OS_GETCWD
+
+
+#ifndef MIN
+# define MIN(a,b) (((a)<(b))?(a):(b))
+# define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
 /* End */