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.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f0bf2a8ea5ca63d224cbe852c970fe8cac87fc79..e5d349946ed16335101207da61e9a60464f40dba 100644 (file)
--- 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 e4b4da03f577ac5f8487492e8561f370b59bc4ee..7b92a2b4d624b591437e93d80a2f832b7c2bc849 100644 (file)
--- 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 61797e43de7b5d053d68d3df0cd40f56fac7a39b..116b246f08ece3a4111954e015f9bb707c26d4ca 100644 (file)
--- 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;