diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-06 02:39:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-06 02:39:45 +0000 |
| commit | fdffd346262841cb194225ea0acd8059c57ec2d4 (patch) | |
| tree | d8b3699131f7d1b94bc46c7d8be62af6b8b5ebfe /nt | |
| parent | a5c508fe3a3f456c987283156315d0384d38fe9e (diff) | |
| parent | a9b4333620eb259e974445066a8e64cee0c21d69 (diff) | |
| download | emacs-fdffd346262841cb194225ea0acd8059c57ec2d4.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 324-352)
- Merge from gnus--rel--5.10
- Update from CVS
- etc/emacs-buffer.gdb: Remove RCS keywords
* gnus--rel--5.10 (patch 70-79)
- Update from CVS
- Merge from emacs--cvs-trunk--0
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 9 | ||||
| -rw-r--r-- | nt/inc/pwd.h | 4 | ||||
| -rw-r--r-- | nt/inc/sys/socket.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 33507ef581d..cfc93422a69 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,12 @@ +2005-06-05 Eli Zaretskii <eliz@gnu.org> + + * inc/sys/socket.h: Change arg 4 of sys_setsockopt to + `const void *', for consistency with Posix. + +2005-06-04 Eli Zaretskii <eliz@gnu.org> + + * inc/pwd.h (getpwnam, getpwuid): Add prototypes. + 2005-05-24 Juanma Barranquero <lekktu@gmail.com> * INSTALL: Add more pointers to ports of Unix tools to Windows, diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h index 11f5669b0f0..31c0df7ec30 100644 --- a/nt/inc/pwd.h +++ b/nt/inc/pwd.h @@ -18,6 +18,10 @@ struct passwd { typedef int uid_t; typedef uid_t gid_t; +struct passwd * getpwnam (char *); +struct passwd * getpwuid (int); + + #endif /* _PWD_H_ */ /* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 422a27d1b52..d3936da2a4d 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -102,7 +102,7 @@ struct hostent * sys_gethostbyname (const char * name); struct servent * sys_getservbyname (const char * name, const char * proto); int sys_getpeername (int s, struct sockaddr *addr, int * namelen); int sys_shutdown (int socket, int how); -int sys_setsockopt (int s, int level, int oname, const char * oval, int olen); +int sys_setsockopt (int s, int level, int oname, const void * oval, int olen); int sys_listen (int s, int backlog); int sys_getsockname (int s, struct sockaddr * name, int * namelen); int sys_accept (int s, struct sockaddr *addr, int *addrlen); |