projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
lib
/
pty.in.h
diff --git
a/lib/pty.in.h
b/lib/pty.in.h
index
5eddfad
..
140b642
100644
(file)
--- a/
lib/pty.in.h
+++ b/
lib/pty.in.h
@@
-1,5
+1,5
@@
/* Substitute for and wrapper around <pty.h>.
/* Substitute for and wrapper around <pty.h>.
- Copyright (C) 2010-201
1
Free Software Foundation, Inc.
+ Copyright (C) 2010-201
3
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-12,10
+12,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#ifndef _
GL
_PTY_H
+#ifndef _
@GUARD_PREFIX@
_PTY_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@
-27,8
+26,8
@@
# @INCLUDE_NEXT@ @NEXT_PTY_H@
#endif
# @INCLUDE_NEXT@ @NEXT_PTY_H@
#endif
-#ifndef _
GL
_PTY_H
-#define _
GL
_PTY_H
+#ifndef _
@GUARD_PREFIX@
_PTY_H
+#define _
@GUARD_PREFIX@
_PTY_H
/* Some platforms declare this in a different header than glibc. */
#if @HAVE_UTIL_H@
/* Some platforms declare this in a different header than glibc. */
#if @HAVE_UTIL_H@
@@
-42,6
+41,14
@@
/* Get 'struct termios' and 'struct winsize'. */
#include <termios.h>
/* Get 'struct termios' and 'struct winsize'. */
#include <termios.h>
+#if defined _AIX
+# include <sys/ioctl.h>
+#endif
+/* Mingw lacks 'struct termios' and 'struct winsize', but a forward
+ declaration of an opaque type is sufficient to allow compilation of
+ a stub openpty(). */
+struct termios;
+struct winsize;
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@
-120,5
+127,5
@@
_GL_WARN_ON_USE (openpty, "openpty is not declared consistently - "
#endif
#endif
-#endif /* _
GL
_PTY_H */
-#endif /* _
GL
_PTY_H */
+#endif /* _
@GUARD_PREFIX@
_PTY_H */
+#endif /* _
@GUARD_PREFIX@
_PTY_H */