X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftermios.in.h;h=f69786b3d22eac798d51f0a000aea7a142747993;hb=4470580881a7b821b52fb5635102ef3e27aa5af4;hp=6d4a2a7897c9c42d326fae8a725f0ceb557bc6ad;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/lib/termios.in.h b/lib/termios.in.h
index 6d4a2a789..f69786b3d 100644
--- a/lib/termios.in.h
+++ b/lib/termios.in.h
@@ -15,20 +15,31 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _GL_TERMIOS_H
+#ifndef _@GUARD_PREFIX@_TERMIOS_H
 
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
 @PRAGMA_COLUMNS@
 
+/* On HP-UX 11.00, some of the function declarations in <sys/termio.h>,
+   included by <termios.h>, are not protected by extern "C".  Enforce
+   "C" linkage for these functions nevertheless.  */
+#if defined __hpux && defined __cplusplus
+# include <sys/types.h>
+# include <sys/ioctl.h>
+extern "C" {
+# include <sys/termio.h>
+}
+#endif
+
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_TERMIOS_H@
 # @INCLUDE_NEXT@ @NEXT_TERMIOS_H@
 #endif
 
-#ifndef _GL_TERMIOS_H
-#define _GL_TERMIOS_H
+#ifndef _@GUARD_PREFIX@_TERMIOS_H
+#define _@GUARD_PREFIX@_TERMIOS_H
 
 #if @GNULIB_TCGETSID@
 /* Get pid_t.  */
@@ -61,5 +72,5 @@ _GL_WARN_ON_USE (tcgetsid, "tcgetsid is not portable - "
 #endif
 
 
-#endif /* _GL_TERMIOS_H */
-#endif /* _GL_TERMIOS_H */
+#endif /* _@GUARD_PREFIX@_TERMIOS_H */
+#endif /* _@GUARD_PREFIX@_TERMIOS_H */