aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/sgtty.h2
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 842d61a..047b6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-10 Andreas Jaeger <aj@suse.de>
+
+ * misc/sgtty.h: Fix typo in last patch.
+
1999-10-09 Ulrich Drepper <drepper@cygnus.com>
* nss/getXXbyYY_r.c (do_weak_alias): Remove unnecessary parenthesis.
@@ -160,7 +164,7 @@
* sunrpc/rpc/svc_auth.h: Likewise.
* sunrpc/rpc/xdr.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigstack.h: Likewise.
- * sysdeps/unix/sysv/linux/bitssocket.h: Likewise.
+ * sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysvipc/sys/ipc.h: Likewise.
* sysvipc/sys/msg.h: Likewise.
* sysvipc/sys/sem.h: Likewise.
diff --git a/misc/sgtty.h b/misc/sgtty.h
index 6d1c5a8..17f0119 100644
--- a/misc/sgtty.h
+++ b/misc/sgtty.h
@@ -30,7 +30,7 @@ struct sgttyb;
__BEGIN_DECLS
/* Fill in *PARAMS with terminal parameters associated with FD. */
-extern int gtty patch(int __fd, struct sgttyb *__params) __THROW;
+extern int gtty (int __fd, struct sgttyb *__params) __THROW;
/* Set the terminal parameters associated with FD to *PARAMS. */
extern int stty (int __fd, __const struct sgttyb *__params) __THROW;
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 491b133..f93e7f4 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -203,13 +203,13 @@ enum
`sendmsg' and received by `recvmsg'. */
struct msghdr
{
- __ptr_t msg_name; /* Address to send to/receive from. */
+ void *msg_name; /* Address to send to/receive from. */
socklen_t msg_namelen; /* Length of address data. */
struct iovec *msg_iov; /* Vector of data to send/receive into. */
size_t msg_iovlen; /* Number of elements in the vector. */
- __ptr_t msg_control; /* Ancillary data (eg BSD filedesc passing). */
+ void *msg_control; /* Ancillary data (eg BSD filedesc passing). */
size_t msg_controllen; /* Ancillary data buffer length. */
int msg_flags; /* Flags on received message. */