OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2001-01-30  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/bits/sockaddr.h: Remove SA_LEN macro.
	* sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Likewise.
	* include/sys/socket.h: Add SA_LEN here for internal use.
This commit is contained in:
Ulrich Drepper 2001-01-31 06:16:26 +00:00
parent 48d99185e3
commit 3f66a0cf1b
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/bits/sockaddr.h: Remove SA_LEN macro.
* sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Likewise.
* include/sys/socket.h: Add SA_LEN here for internal use.
2001-01-29 Ulrich Drepper <drepper@redhat.com>
* malloc/Makefile: Don't build memusagestat if cross-compiling.

6
bits/sockaddr.h
View File

@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version.
Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -37,8 +37,4 @@ typedef unsigned short int sa_family_t;
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
/* Return the length of a `sockaddr' structure. */
#define SA_LEN(_x) __libc_sa_len((_x)->sa_family)
extern int __libc_sa_len (sa_family_t __af) __THROW;
#endif /* bits/sockaddr.h */

8
include/sys/socket.h
View File

@ -28,4 +28,12 @@ extern int __send (int __fd, __const void *__buf, size_t __n, int __flags);
Return 0 on success, -1 for errors. */
extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
/* Return the length of a `sockaddr' structure. */
#ifdef _HAVE_SA_LEN
# define SA_LEN(_x) (_x)->sa_len
#else
# define SA_LEN(_x) __libc_sa_len((_x)->sa_family)
extern int __libc_sa_len (sa_family_t __af) __THROW;
#endif
#endif

6
sysdeps/generic/bits/sockaddr.h
View File

@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version.
Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -37,8 +37,4 @@ typedef unsigned short int sa_family_t;
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
/* Return the length of a `sockaddr' structure. */
#define SA_LEN(_x) __libc_sa_len((_x)->sa_family)
extern int __libc_sa_len (sa_family_t __af) __THROW;
#endif /* bits/sockaddr.h */

5
sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h
View File

@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. 4.4 BSD version.
Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -38,7 +38,4 @@ typedef unsigned char sa_family_t;
#define __SOCKADDR_COMMON_SIZE (2 * sizeof (unsigned char))
/* Return the length of a `sockaddr' structure. */
#define SA_LEN(_x) ((_x)->sa_len)
#endif /* bits/sockaddr.h */