aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2009-12-26 06:20:56 +0000
committerEric Blake <eblake@redhat.com>2009-12-26 06:20:56 +0000
commit1c0a4c3a8e679dbc8238d03b30e2fb76be9aec35 (patch)
tree1fcd77cad971fb4306ac2f4a44acea15f4d381b8 /winsup
parent37520977df49e4833ac14335cd5179b58af69cb9 (diff)
downloadnewlib-1c0a4c3a8e679dbc8238d03b30e2fb76be9aec35.zip
newlib-1c0a4c3a8e679dbc8238d03b30e2fb76be9aec35.tar.gz
newlib-1c0a4c3a8e679dbc8238d03b30e2fb76be9aec35.tar.bz2
Make pty.h match recent glibc.
* include/pty.h (openpty, forkpty): Mark last two arguments const, to match glibc 2.8. * libc/bsdlib.cc (openpty, forkpty): Likewise.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/include/pty.h6
-rw-r--r--winsup/cygwin/libc/bsdlib.cc7
3 files changed, 14 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f0bf2a8..e5d3499 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-26 Eric Blake <ebb9@byu.net>
+
+ * include/pty.h (openpty, forkpty): Mark last two arguments const,
+ to match glibc 2.8.
+ * libc/bsdlib.cc (openpty, forkpty): Likewise.
+
2009-12-25 Andy Koppe <andy.koppe@gmail.com>
* fhandler_console.cc (handler_console::read): Use the tty's VERASE
diff --git a/winsup/cygwin/include/pty.h b/winsup/cygwin/include/pty.h
index e4b4da0..7b92a2b 100644
--- a/winsup/cygwin/include/pty.h
+++ b/winsup/cygwin/include/pty.h
@@ -8,8 +8,10 @@
extern "C" {
#endif
-int _EXFUN(openpty ,(int *, int *, char *, struct termios *, struct winsize *));
-int _EXFUN(forkpty ,(int *, char *, struct termios *, struct winsize *));
+int _EXFUN(openpty ,(int *, int *, char *, const struct termios *,
+ const struct winsize *));
+int _EXFUN(forkpty ,(int *, char *, const struct termios *,
+ const struct winsize *));
#ifdef __cplusplus
}
diff --git a/winsup/cygwin/libc/bsdlib.cc b/winsup/cygwin/libc/bsdlib.cc
index 61797e4..116b246 100644
--- a/winsup/cygwin/libc/bsdlib.cc
+++ b/winsup/cygwin/libc/bsdlib.cc
@@ -97,8 +97,8 @@ login_tty (int fd)
}
extern "C" int
-openpty (int *amaster, int *aslave, char *name, struct termios *termp,
- struct winsize *winp)
+openpty (int *amaster, int *aslave, char *name, const struct termios *termp,
+ const struct winsize *winp)
{
int master, slave;
char pts[TTY_NAME_MAX];
@@ -130,7 +130,8 @@ openpty (int *amaster, int *aslave, char *name, struct termios *termp,
}
extern "C" int
-forkpty (int *amaster, char *name, struct termios *termp, struct winsize *winp)
+forkpty (int *amaster, char *name, const struct termios *termp,
+ const struct winsize *winp)
{
int master, slave, pid;