INN commit: trunk (3 files)

[INN Commit]

    Date: Thursday, January 29, 2009 @ 11:46:28
  Author: iulius
Revision: 8302

setproctitle, strlcat and strlcpy may exist as functions but
without being prototyped (for instance on BSD/OS).
Add their prototype if it is needed.

Modified:
  trunk/configure.ac
  trunk/include/clibrary.h
  trunk/include/portable/setproctitle.h

---------------------------------+
 configure.ac                    |    3 ++-
 include/clibrary.h              |    4 ++--
 include/portable/setproctitle.h |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

Modified: configure.ac
===================================================================
--- configure.ac	2009-01-29 18:50:30 UTC (rev 8301)
+++ configure.ac	2009-01-29 19:46:28 UTC (rev 8302)
@@ -400,7 +400,8 @@
 AC_CHECK_HEADERS([ndbm.h db1/ndbm.h gdbm-ndbm.h], [break])
 
 dnl Check for whether various symbols are declared.
-AC_CHECK_DECLS([pread, pwrite, snprintf, vsnprintf])
+AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat,
+                strlcpy, vsnprintf])
 AC_CHECK_DECLS([h_errno], , , [#include <netdb.h>])
 AC_CHECK_DECLS([inet_aton, inet_ntoa], , ,
 [#include <sys/types.h>

Modified: include/clibrary.h
===================================================================
--- include/clibrary.h	2009-01-29 18:50:30 UTC (rev 8301)
+++ include/clibrary.h	2009-01-29 19:46:28 UTC (rev 8302)
@@ -135,10 +135,10 @@
 #if !HAVE_STRERROR
 extern const char *     strerror(int);
 #endif
-#if !HAVE_STRLCAT
+#if !HAVE_STRLCAT || !HAVE_DECL_STRLCAT
 extern size_t           strlcat(char *, const char *, size_t);
 #endif
-#if !HAVE_STRLCPY
+#if !HAVE_STRLCPY || !HAVE_DECL_STRLCPY
 extern size_t           strlcpy(char *, const char *, size_t);
 #endif
 #if !HAVE_SYMLINK

Modified: include/portable/setproctitle.h
===================================================================
--- include/portable/setproctitle.h	2009-01-29 18:50:30 UTC (rev 8301)
+++ include/portable/setproctitle.h	2009-01-29 19:46:28 UTC (rev 8302)
@@ -12,7 +12,7 @@
 
 #include "config.h"
 
-#if !HAVE_SETPROCTITLE
+#if !HAVE_SETPROCTITLE || !HAVE_DECL_SETPROCTITLE
 void setproctitle(const char *format, ...);
 #endif