From 43e2d810d7e49b1b151b99546dacffb7ff82ecc4 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Fri, 18 May 2012 21:55:29 +0000 Subject: [PATCH] Bug 754649: Add support for Hurd. The patch is contributed by Mike Hommey . r=wtc. Modified Files: _linux.cfg _pth.h uxrng.c git-svn-id: svn://10.0.0.236/trunk@263839 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/pr/include/md/_linux.cfg | 2 ++ mozilla/nsprpub/pr/include/md/_pth.h | 4 ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg index 76bbcde9f87..3597d7aee74 100644 --- a/mozilla/nsprpub/pr/include/md/_linux.cfg +++ b/mozilla/nsprpub/pr/include/md/_linux.cfg @@ -21,6 +21,8 @@ #ifdef __FreeBSD_kernel__ #define PR_AF_INET6 28 /* same as AF_INET6 */ +#elif defined(__GNU__) +#define PR_AF_INET6 26 /* same as AF_INET6 */ #else #define PR_AF_INET6 10 /* same as AF_INET6 */ #endif diff --git a/mozilla/nsprpub/pr/include/md/_pth.h b/mozilla/nsprpub/pr/include/md/_pth.h index 9270f324176..eeeef04387b 100644 --- a/mozilla/nsprpub/pr/include/md/_pth.h +++ b/mozilla/nsprpub/pr/include/md/_pth.h @@ -118,10 +118,6 @@ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) -#ifdef __GNU__ -/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */ -#error Using Hurd pthreads -#endif #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0 #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0 #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) diff --git a/mozilla/nsprpub/pr/src/md/unix/uxrng.c b/mozilla/nsprpub/pr/src/md/unix/uxrng.c index 71e8eac3a48..7223aa3d36a 100644 --- a/mozilla/nsprpub/pr/src/md/unix/uxrng.c +++ b/mozilla/nsprpub/pr/src/md/unix/uxrng.c @@ -94,7 +94,7 @@ GetHighResClock(void *buf, size_t maxbytes) #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \ - || defined(SYMBIAN)) + || defined(SYMBIAN) || defined(__GNU__)) #include #include #include