nspr: fix build

This commit is contained in:
Sergei Reznikov
2015-10-13 12:50:49 +03:00
parent dda08523bb
commit 8e8931b0bc
2 changed files with 10 additions and 10 deletions

View File

@@ -13,7 +13,7 @@ COPYRIGHT="Mozilla Foundation"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz"
CHECKSUM_SHA256="507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15"
REVISION="1"
REVISION="2"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
SOURCE_DIR="nspr-$portVersion/nspr"

View File

@@ -231,18 +231,18 @@ index da2f7e9..cbef872 100644
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
index b86248f..0f07192 100644
index b86248f..c53d56e 100644
--- a/pr/src/misc/prnetdb.c
+++ b/pr/src/misc/prnetdb.c
@@ -54,7 +54,7 @@ PRLock *_pr_dnsLock = NULL;
* Some return a pointer to struct protoent, others return
* an int, and glibc's flavor takes five arguments.
@@ -1154,7 +1154,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr(
* any usable implementation.
*/
-#if defined(XP_BEOS) && defined(BONE_VERSION)
+#if defined(HAIKU) || (defined(XP_BEOS) && defined(BONE_VERSION))
#include <arpa/inet.h> /* pick up define for inet_addr */
#include <sys/socket.h>
#define _PR_HAVE_GETPROTO_R
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(HAIKU)
/* Android's Bionic libc system includes prototypes for these in netdb.h,
* but doesn't actually include implementations. It uses the 5-arg form,
* so these functions end up not matching the prototype. So just rename
diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c
index 125f1f9..fe51684 100644
--- a/pr/src/pthreads/ptio.c