[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-121-gb241f31

[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  b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95 (commit)
      from  c06cef529709888c71ba3b1be1d3655b4a9c2f57 (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=b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95


commit b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95
Author: Alfred M. Szmidt <address@hidden>
Date:   Wed Oct 19 18:14:30 2011 +0200

    * telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include 
<stropts.h> if HAVE_IOCTL wasn't defined.

diff --git a/ChangeLog b/ChangeLog
index 3f7c213..3ca99ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Alfred M. Szmidt  <address@hidden>
+
+       * telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include
+       <stropts.h> if HAVE_IOCTL wasn't defined.
+
 2011-10-15  Alfred M. Szmidt  <address@hidden>
 
        * .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 7b5c033..b5b4a5b 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -44,7 +44,7 @@
 #ifdef HAVE_SYS_PTYVAR_H
 # include <sys/ptyvar.h>
 #endif
-#ifdef HAVE_STROPTS_H
+#if defined HAVE_STROPTS_H && !defined HAVE_IOCTL
 # include <stropts.h>
 #endif
 #include <sys/ioctl.h>

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

Summary of changes:
 ChangeLog         |    5 +++++
 telnetd/telnetd.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils