[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-216-g2da98e3

[Alfred M. Szmidt]

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  2da98e306086d9716d681c250f6f30edbf6f39c7 (commit)
      from  1a343be8d0fdf635f96d9d5cc20972a72f6688d3 (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=2da98e306086d9716d681c250f6f30edbf6f39c7


commit 2da98e306086d9716d681c250f6f30edbf6f39c7
Author: Alfred M. Szmidt <address@hidden>
Date:   Sat Dec 31 15:21:47 2011 +0100

    Fix prohibit_always_true_header_tests syntax-checks.

diff --git a/ChangeLog b/ChangeLog
index 25fdf5d..b180c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-12-31  Alfred M. Szmidt  <address@hidden>
+
+       Fix prohibit_always_true_header_tests syntax-checks.
+
+       * ifconfig/printif.c: Don't protect inclusion of <alloca.h> with
+       HAVE_ALLOCA_H.
+
+       * configure.ac: Don't protect inclusion of <sys/types.h> with
+       HAVE_SYS_TYPES_H.
+       * libinetutils/daemon.c: Likewise.
+       * telnet/commands.c: Likewise.
+       * src/syslogd.c: Likewise.
+
 2011-12-30  Mats Erik Andersson <address@hidden>
 
        * configure.ac: Check for ruserok.  If iruserok exists, then define
diff --git a/configure.ac b/configure.ac
index 8ff47e2..1a30bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,9 +192,7 @@ AC_SUBST(libls_BUILD)
 
 dnl At least OpenSolaris is missing <protocols/talkd.h>.
 AC_CHECK_HEADER(protocols/talkd.h, , ,
-  [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                # include <sys/types.h>
-                #endif
+  [IU_FLUSHLEFT([#include <sys/types.h>
                 #include <sys/socket.h>])])
 
 if test "$ac_cv_header_protocols_talkd_h" = no; then
@@ -372,17 +370,13 @@ if test "$ipv6" = "no" || test "$working_ipv6" = "no";then
 else
   working_icmp6=yes
   AC_CHECK_HEADER(netinet/icmp6.h, , working_icmp6=no,
-    [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                  # include <sys/types.h>
-                  #endif
+    [IU_FLUSHLEFT([#include <sys/types.h>
                   #include <sys/socket.h>
                   #include <netinet/in.h>])])
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_HEADER(netinet/ip6.h, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                    # include <sys/types.h>
-                    #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
                     #include <sys/socket.h>
                     #include <netinet/in.h>])])
 
@@ -390,9 +384,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_filter, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                    # include <sys/types.h>
-                    #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
                     #include <sys/socket.h>
                     #include <netinet/in.h>
                     #include <netinet/icmp6.h>])])
@@ -400,9 +392,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     AC_CHECK_TYPE(struct icmp6_hdr, , working_icmp6=no,
-      [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                    # include <sys/types.h>
-                    #endif
+      [IU_FLUSHLEFT([#include <sys/types.h>
                     #include <sys/socket.h>
                     #include <netinet/in.h>
                     #include <netinet/icmp6.h>])])
@@ -450,9 +440,7 @@ else
 
   if test "$working_icmp6" = "yes"; then
     IU_CHECK_MACRO(ICMP6_DST_UNREACH_BEYONDSCOPE,
-                   [#ifdef HAVE_SYS_TYPES_H
-                   # include <sys/types.h>
-                   #endif
+                   [#include <sys/types.h>
                    #include <sys/socket.h>
                    #include <netinet/in.h>
                    #include <netinet/icmp6.h>], ,
@@ -738,9 +726,7 @@ AC_CHECK_DECLS([getcwd, getlogin, getpass, getusershell, 
ttyname], , ,
 AC_CHECK_DECLS([getgrnam, initgroups], , , [#include <grp.h>])
 
 AC_CHECK_DECLS(htons, , ,
-  [IU_FLUSHLEFT([#ifdef HAVE_SYS_TYPES_H
-                 # include <sys/types.h>
-                 #endif
+  [IU_FLUSHLEFT([# include <sys/types.h>
                  #ifdef HAVE_SYS_PARAM_H
                  # include <sys/param.h>
                  #endif
diff --git a/ifconfig/printif.c b/ifconfig/printif.c
index e87b803..1b86cf0 100644
--- a/ifconfig/printif.c
+++ b/ifconfig/printif.c
@@ -37,10 +37,7 @@
 # endif
 #endif
 
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
+#include <alloca.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/libinetutils/daemon.c b/libinetutils/daemon.c
index f9c29cf..1efb1f1 100644
--- a/libinetutils/daemon.c
+++ b/libinetutils/daemon.c
@@ -53,9 +53,7 @@
 #include <signal.h>
 #include <error.h>
 #include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #include <sys/wait.h>
 
 /*
diff --git a/src/syslogd.c b/src/syslogd.c
index b3a28cc..4b7b87a 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -89,9 +89,7 @@
 #include <time.h>
 #include <sys/resource.h>
 #include <poll.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 #include <netinet/in.h>
 #include <netdb.h>
diff --git a/telnet/commands.c b/telnet/commands.c
index 260bcad..1e9117d 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -52,9 +52,7 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 

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

Summary of changes:
 ChangeLog             |   13 +++++++++++++
 configure.ac          |   28 +++++++---------------------
 ifconfig/printif.c    |    5 +----
 libinetutils/daemon.c |    4 +---
 src/syslogd.c         |    4 +---
 telnet/commands.c     |    4 +---
 6 files changed, 24 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
GNU Inetutils