Logging: mark continued-TLS connection deliveries with "X-*"

[exim.git] / src / src / osfunctions.h

diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h
index a6cec0dc2f5a11bef0960d8a985f09d319b031fe..4e6e9a91c9e86db3ece888d0ca13b897ffc91de3 100644 (file)
--- a/src/src/osfunctions.h
+++ b/src/src/osfunctions.h
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/osfunctions.h,v 1.5 2009/11/16 19:50:37 nm4 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Prototypes for os-specific functions. For utilities, we don't need the one
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Prototypes for os-specific functions. For utilities, we don't need the one


@@ -14,15 +12,31 @@ that uses a type that isn't defined for them. */
 extern ip_address_item *os_common_find_running_interfaces(void);
 #endif
 
 extern ip_address_item *os_common_find_running_interfaces(void);
 #endif
 

+/* If these exist as a macro, then they're overridden away from us and we
+rely upon the system headers to provide prototype declarations for us.
+Notably, strsignal() is not in the Single Unix Specification (v3) and
+predicting constness is awkward. */
+
+#ifndef os_getloadavg

 extern int           os_getloadavg(void);
 extern int           os_getloadavg(void);

+#endif
+#ifndef os_restarting_signal

 extern void          os_restarting_signal(int, void (*)(int));
 extern void          os_restarting_signal(int, void (*)(int));

+#endif
+#ifndef os_non_restarting_signal

 extern void          os_non_restarting_signal(int, void (*)(int));
 extern void          os_non_restarting_signal(int, void (*)(int));

+#endif
+#ifndef os_strexit

 extern const char   *os_strexit(int);     /* char to match os_strsignal */
 extern const char   *os_strexit(int);     /* char to match os_strsignal */

-
-/* When os_strsignal aliases to a system function, don't define an
-additional prototype */
+#endif

 #ifndef os_strsignal
 extern const char   *os_strsignal(int);   /* char to match strsignal in some OS */
 #endif
 #ifndef os_strsignal
 extern const char   *os_strsignal(int);   /* char to match strsignal in some OS */
 #endif

+#ifndef os_unsetenv
+extern int           os_unsetenv(const uschar *);
+#endif
+#ifndef os_getcwd
+extern uschar       *os_getcwd(uschar *, size_t);
+#endif

 
 /* End of osfunctions.h */
 
 /* End of osfunctions.h */