From c946b6be47b3c83eef19f3347c17af256a08ef50 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <devnull@localhost>
Date: Wed, 23 Feb 2000 23:38:19 +0000
Subject: Landed NSPRPUB_RELEASE_4_0_20000223 onto the main trunk.

---
 pr/src/misc/prinit.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'pr/src/misc/prinit.c')

diff --git a/pr/src/misc/prinit.c b/pr/src/misc/prinit.c
index 57fb1c9a..3cdefe35 100644
--- a/pr/src/misc/prinit.c
+++ b/pr/src/misc/prinit.c
@@ -78,11 +78,11 @@ PR_IMPLEMENT(PRBool) PR_VersionCheck(const char *importedVersion)
     /*
     ** This is the secret handshake algorithm.
     **
-    ** This release (3.1) is backward compatible with
-    ** all the previous releases ("2.1 19980529", "3.0",
-    ** "3.0.x").  It is not compatible with future
-    ** releases or patches.  So this release has a
-    ** simple version compatibility check algorithm.
+    ** This release has a simple version compatibility
+    ** check algorithm.  This release is not backward
+    ** compatible with previous major releases.  It is
+    ** not compatible with future major, minor, or
+    ** patch releases.
     */
     int vmajor = 0, vminor = 0, vpatch = 0;
     const char *ptr = importedVersion;
@@ -106,7 +106,7 @@ PR_IMPLEMENT(PRBool) PR_VersionCheck(const char *importedVersion)
         }
     }
 
-    if (vmajor > PR_VMAJOR) {
+    if (vmajor != PR_VMAJOR) {
         return PR_FALSE;
     }
     if (vmajor == PR_VMAJOR && vminor > PR_VMINOR) {
@@ -144,6 +144,10 @@ static void _pr_SetNativeThreadsOnlyMode(void)
 }
 #endif
 
+#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
+extern PRStatus _pr_init_ipv6();
+#endif
+
 static void _PR_InitStuff(void)
 {
 
@@ -220,6 +224,10 @@ static void _PR_InitStuff(void)
 
     nspr_InitializePRErrorTable();
 
+#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE)
+	_pr_init_ipv6();
+#endif
+	
     _PR_MD_FINAL_INIT();
 }
 
-- 
cgit v1.2.1