diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-06-08 19:54:56 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-06-08 19:54:56 +0000 |
| commit | c30ab1c3f3c7c20ad2e6b058675a13ab3ec141bd (patch) | |
| tree | f5eafe96ea17ebf1f6132677a07b2ab612ee0115 | |
| parent | 72ec574578708cca7300b3db9577aaaa08e2ff5f (diff) | |
| download | nspr-hg-c30ab1c3f3c7c20ad2e6b058675a13ab3ec141bd.tar.gz | |
Bugzilla bug #77264: the workaround for the new struct sockaddr_in6 in
glibc 2.2 is only needed when we compile with glibc 2.1.
Modified files: prsocket.c, ptio.c
| -rw-r--r-- | pr/src/io/prsocket.c | 2 | ||||
| -rw-r--r-- | pr/src/pthreads/ptio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pr/src/io/prsocket.c b/pr/src/io/prsocket.c index 3194d657..2483f963 100644 --- a/pr/src/io/prsocket.c +++ b/pr/src/io/prsocket.c @@ -65,7 +65,7 @@ static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len) && (addr->raw.family != AF_UNIX) #endif && (PR_NETADDR_SIZE(addr) != addr_len)) { -#if defined(LINUX) +#if defined(LINUX) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 1 /* * In glibc 2.1, struct sockaddr_in6 is 24 bytes. In glibc 2.2 * and in the 2.4 kernel, struct sockaddr_in6 has the scope_id diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c index 2b55af23..ec5b8921 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -236,7 +236,7 @@ static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len) if ((addr != NULL) && (addr->raw.family != AF_UNIX) && (PR_NETADDR_SIZE(addr) != addr_len)) { -#if defined(LINUX) +#if defined(LINUX) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 1 /* * In glibc 2.1, struct sockaddr_in6 is 24 bytes. In glibc 2.2 * and in the 2.4 kernel, struct sockaddr_in6 has the scope_id |