Rely on system prototypes if we #define our os funcs.

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

diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h
index 7631540f2a8a88e4d06c4928981c1acccd42ab1d..14111d383b68e3cad8ca336cbd4360a10f3eae2a 100644 (file)
--- a/src/src/osfunctions.h
+++ b/src/src/osfunctions.h
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/osfunctions.h,v 1.4 2007/01/08 10:50:18 ph10 Exp $ */
+/* $Cambridge: exim/src/src/osfunctions.h,v 1.5 2009/11/16 19:50:37 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Prototypes for os-specific functions. For utilities, we don't need the one
@@ -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
 
-extern int     os_getloadavg(void);
-extern void    os_restarting_signal(int, void (*)(int));
-extern void    os_non_restarting_signal(int, void (*)(int));
-extern char   *os_strexit(int);     /* char to match os_strsignal */
-extern char   *os_strsignal(int);   /* char to match strsignal in some OS */
+/* 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 */