Bug 1393854, NSPR_4_17_BETA2
authorKai Engert <kaie@kuix.de>
Mon, 18 Sep 2017 19:01:47 +0200
changeset 666437 777af9e19f70bb0a382daeed84db4c6fb3da75ff
parent 666436 fa1052b9a9529e7e7ccee343475ed3d5c0ac7674
child 666438 63281179bfe0ddbdfc3e03b746252a52e2f8ce3b
push id80410
push userbmo:ttromey@mozilla.com
push dateMon, 18 Sep 2017 19:18:46 +0000
bugs1393854
milestone57.0a1
Bug 1393854, NSPR_4_17_BETA2 UPGRADE_NSPR_RELEASE
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/prinet.h
nsprpub/pr/src/nspr.def
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_17_BETA1
+NSPR_4_17_BETA2
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,8 +5,9 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
+
--- a/nsprpub/pr/include/prinet.h
+++ b/nsprpub/pr/include/prinet.h
@@ -49,17 +49,17 @@
  */
 struct ether_addr;
 struct sockaddr_dl;
 #endif /* AIX */
 #include <arpa/inet.h>
 #endif /* XP_UNIX */
 #include <netdb.h>
 
-#if defined(FREEBSD) || defined(BSDI) || defined(QNX)
+#if defined(BSDI) || defined(QNX)
 #include <rpc/types.h> /* the only place that defines INADDR_LOOPBACK */
 #endif
 
 /*
  * OS/2 hack.  For some reason INADDR_LOOPBACK is not defined in the
  * socket headers.
  */
 #if defined(OS2) && !defined(INADDR_LOOPBACK)
--- a/nsprpub/pr/src/nspr.def
+++ b/nsprpub/pr/src/nspr.def
@@ -457,12 +457,8 @@ EXPORTS ;-
 ;+} NSPR_4.9.2;
 ;+# Function PR_DuplicateEnvironment had been added in NSPR 4.10.9,
 ;+# but we neglected to add it to nspr.def until NSPR 4.12
 ;+NSPR_4.12 {
 ;+      global:
 		PR_DuplicateEnvironment;
 		PR_GetEnvSecure;
 ;+} NSPR_4.10.3;
-;+NSPR_4.17 {
-;+      global:
-		PR_EXPERIMENTAL_ONLY_IN_4_17_GetOverlappedIOHandle;
-;+} NSPR_4.16;