[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-186-gd53944d

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  d53944dca6544de38238e950f382de621fdc407e (commit)
      from  bfee55f68b31152a62d68fef07cec9461fd905a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=d53944dca6544de38238e950f382de621fdc407e


commit d53944dca6544de38238e950f382de621fdc407e
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Nov 30 04:09:13 2011 +0100

    Portability fix for <syslog.h> in recent OpenBSD.

diff --git a/ChangeLog b/ChangeLog
index ad2d939..74d415c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-30  Mats Erik Andersson <address@hidden>
+
+       OpenBSD 4.9 has changed <syslog.h>.  Relax configuration.
+
+       * configure.ac (syslog internal macros): Remove check of LOG_MAKEPRI.
+       * src/syslogd.c (LOG_MAKEPRI) [!LOG_MAKEPRI]: New macro.
+
 2011-11-29  Alfred M. Szmidt  <address@hidden>
 
        Basic test case for `hostname'.
diff --git a/configure.ac b/configure.ac
index b0e1e49..e4af8a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,7 +690,7 @@ define([iu_syslog_includes],
     #include <syslog.h> ]])
 IU_CHECK_MACRO(syslog internal macros,
   iu_syslog_includes,
-  [LOG_MAKEPRI LOG_PRI LOG_FAC],
+  [LOG_PRI LOG_FAC],
   AC_CHECK_TYPE(CODE,
     AC_CHECK_DECL(prioritynames,
       AC_DEFINE([HAVE_SYSLOG_INTERNAL], 1, [FIXME]),,
diff --git a/src/syslogd.c b/src/syslogd.c
index 1e943ab..1a660f5 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -116,6 +116,10 @@
 # include "logprio.h"
 #endif
 
+#ifndef LOG_MAKEPRI
+#  define LOG_MAKEPRI(fac, p)  (((fac) << 3) | (p))
+#endif
+
 #include <error.h>
 #include <progname.h>
 #include <libinetutils.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    7 +++++++
 configure.ac  |    2 +-
 src/syslogd.c |    4 ++++
 3 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils