diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-16 01:03:05 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-16 01:03:05 +0000 |
| commit | c55dca8d85b4585f3e72eb72a9c1164568a68472 (patch) | |
| tree | 722774c408917a8348e46f320bd78e0f5ac956e4 /sysdeps/unix/sysv/linux/bits/socket.h | |
| parent | f7d1f342cc8000eb937a38362fa5bcf65023464f (diff) | |
| download | glibc-c55dca8d85b4585f3e72eb72a9c1164568a68472.tar.gz glibc-c55dca8d85b4585f3e72eb72a9c1164568a68472.tar.xz glibc-c55dca8d85b4585f3e72eb72a9c1164568a68472.zip | |
* sysdeps/gnu/bits/utmp.h: Include <bits/wordsize.h>.
(struct lastlog) [__WORDSIZE == 64 && __WORDSIZE_COMPAT32]: Use int32_t for ll_time. (struct utmp) [__WORDSIZE == 64 && __WORDSIZE_COMPAT32]: Use int32_t instead of long int for ut_session. Use an anonymous struct with 32-bit fields for ut_tv. * sysdeps/gnu/bits/utmpx.h: Include <bits/wordsize.h>. (struct utmpx) [__WORDSIZE == 64 && __WORDSIZE_COMPAT32]: Do the same here as in utmp.h for `struct utmp'. * sysdeps/unix/sysv/linux/powerpc/bits/utmp.h: File removed. * sysdeps/unix/sysv/linux/powerpc/bits/utmpx.h: File removed. * sysdeps/unix/sysv/linux/sparc/bits/utmp.h: File removed. * sysdeps/unix/sysv/linux/sparc/bits/utmpx.h: File removed. * sysdeps/unix/sysv/linux/x86_64/bits/utmp.h: File removed. * sysdeps/unix/sysv/linux/x86_64/bits/utmpx.h: File removed. * sysdeps/unix/sysv/linux/bits/resource.h: Replaced with the contents of the sysdeps/unix/sysv/linux/i386/bits/resource.h file. All the following files were identical or equivalent to it. * sysdeps/unix/sysv/linux/i386/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/arm/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/cris/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/hppa/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/ia64/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/m68k/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/powerpc/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/s390/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/sh/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/x86_64/bits/resource.h: File removed. * sysdeps/unix/sysv/linux/bits/socket.h (struct msghdr): Use size_t instead of int for msg_iovlen, instead of socklen_t for msg_controllen. Other than the previously incorrect sign of msg_iovlen, this is a no-op on 32-bit platforms. On 64-bit platforms it makes this header match their layouts as well, so the following are now identical to it. * sysdeps/unix/sysv/linux/s390/bits/socket.h: File removed. * sysdeps/unix/sysv/linux/sparc/bits/socket.h: File removed. * sysdeps/unix/sysv/linux/x86_64/bits/socket.h: File removed. * sysdeps/unix/sysv/linux/ia64/bits/socket.h: File removed. * sysdeps/unix/sysv/linux/alpha/bits/socket.h: File removed.
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits/socket.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 61644073b1..c28e03ff35 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -218,10 +218,10 @@ struct msghdr socklen_t msg_namelen; /* Length of address data. */ struct iovec *msg_iov; /* Vector of data to send/receive into. */ - int msg_iovlen; /* Number of elements in the vector. */ + size_t msg_iovlen; /* Number of elements in the vector. */ void *msg_control; /* Ancillary data (eg BSD filedesc passing). */ - socklen_t msg_controllen; /* Ancillary data buffer length. */ + size_t msg_controllen; /* Ancillary data buffer length. */ int msg_flags; /* Flags on received message. */ }; |