From: Phil Pennock <pdp@exim.org>
Date: Sat, 26 Mar 2011 18:08:02 +0000 (-0400)
Subject: Merge branch 'master' of git://git.exim.org/exim
X-Git-Tag: exim-4_76_RC1~6
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=b9d8b5586790946de2fef94e0b8c43d573a71090;hp=f0c168a88e613f1d020300ae01109fecf95be646

Merge branch 'master' of git://git.exim.org/exim
---

diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h
index 19b580860..14111d383 100644
--- a/src/src/osfunctions.h
+++ b/src/src/osfunctions.h
@@ -14,10 +14,25 @@ that uses a type that isn't defined for them. */
 extern ip_address_item *os_common_find_running_interfaces(void);
 #endif
 
+/* If these exist as a macro, then they're overriden 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);
+#endif
+#ifndef os_restarting_signal
 extern void          os_restarting_signal(int, void (*)(int));
+#endif
+#ifndef os_non_restarting_signal
 extern void          os_non_restarting_signal(int, void (*)(int));
+#endif
+#ifndef os_strexit
 extern const char   *os_strexit(int);     /* char to match os_strsignal */
+#endif
+#ifndef os_strsignal
 extern const char   *os_strsignal(int);   /* char to match strsignal in some OS */
+#endif
 
 /* End of osfunctions.h */