diff options
author | wtchang%redhat.com <devnull@localhost> | 2006-02-28 00:00:48 +0000 |
---|---|---|
committer | wtchang%redhat.com <devnull@localhost> | 2006-02-28 00:00:48 +0000 |
commit | aaf96ad101f147ee87074bebad2dcc1ddce1ceba (patch) | |
tree | 6d94f2c949501c0cbf1f9f615dceda4f7abc8034 | |
parent | 04cb6d2664056b1ec8884711b3aebb66ab91044a (diff) | |
download | nspr-hg-aaf96ad101f147ee87074bebad2dcc1ddce1ceba.tar.gz |
Bugzilla Bug 261649: BeOS has the getprotobyxxx_r functions, but theyTHREADS_20060307_BASE
aren't glibc's 5-argument version.
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r-- | pr/src/misc/prnetdb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index 31514568..7b2c8518 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -82,9 +82,9 @@ PRLock *_pr_dnsLock = NULL; /* * Some platforms have the reentrant getprotobyname_r() and - * getprotobynumber_r(). However, they come in two flavors. + * getprotobynumber_r(). However, they come in three flavors. * Some return a pointer to struct protoent, others return - * an int. + * an int, and glibc's flavor takes five arguments. */ #if defined(XP_BEOS) && defined(BONE_VERSION) #include <arpa/inet.h> /* pick up define for inet_addr */ @@ -108,7 +108,8 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_GETPROTO_R_INT #endif -#if (defined(__GLIBC__) && __GLIBC__ >= 2) +/* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_5_ARG_GETPROTO_R #endif |