Date: Sun, 12 Aug 2012 13:32:12 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r924 - branches/experimental/devel/nspr/files Message-ID: <201208121332.q7CDWCuH037521@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Aug 12 13:32:12 2012 New Revision: 924 Log: better conflict with bug#782109 Added: branches/experimental/devel/nspr/files/patch-bug782109 Modified: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Modified: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h ============================================================================== --- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Sat Aug 11 04:50:58 2012 (r923) +++ branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Sun Aug 12 13:32:12 2012 (r924) @@ -11,20 +11,3 @@ #else #error "Unknown CPU architecture" #endif -@@ -106,6 +110,16 @@ - #define _PR_IPV6_V6ONLY_PROBE - #endif - -+#if (__FreeBSD_version >= 700016) -+#if defined(_PR_PTHREADS) -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#define _PR_HAVE_GETHOST_R -+#define _PR_HAVE_GETHOST_R_INT -+#define _PR_HAVE_THREADSAFE_GETHOST -+#endif -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS Added: branches/experimental/devel/nspr/files/patch-bug782109 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/devel/nspr/files/patch-bug782109 Sun Aug 12 13:32:12 2012 (r924) @@ -0,0 +1,31 @@ +--- ../pr/include/md/_freebsd.h~ ++++ ../pr/include/md/_freebsd.h +@@ -47,6 +47,14 @@ + #define _PR_HAVE_LARGE_OFF_T + + #if defined(_PR_PTHREADS) ++#if __FreeBSD_version >= 602000 ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#endif ++#if __FreeBSD_version >= 700016 ++#define _PR_HAVE_GETHOST_R ++#define _PR_HAVE_GETHOST_R_INT ++#endif + #if __FreeBSD_version >= 400008 + /* + * libc_r before this version of FreeBSD doesn't have poll(). +--- ../pr/src/misc/prnetdb.c ++++ ../pr/src/misc/prnetdb.c +@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL; + #define _PR_HAVE_GETPROTO_R_INT + #endif + +-#if __FreeBSD_version >= 602000 +-#define _PR_HAVE_GETPROTO_R +-#define _PR_HAVE_5_ARG_GETPROTO_R +-#endif +- + /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ + #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) + #define _PR_HAVE_GETPROTO_R
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208121332.q7CDWCuH037521>