Bug 195411: added the LL_MaxUint function and the LL_MAXUINT macro.

Modified Files: prlong.h nspr.def nspr_symvec.opt openvms.c prlong.c
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH

5 files changed, 20 insertions, 4 deletions

diff --git a/pr/include/prlong.h b/pr/include/prlong.h
index 898b2f6d..b72471e9 100644
--- a/pr/include/prlong.h
+++ b/pr/include/prlong.h
@@ -51,6 +51,7 @@ PR_BEGIN_EXTERN_C
 ** DEFINES:     LL_MaxInt
 **              LL_MinInt
 **              LL_Zero
+**              LL_MaxUint
 ** DESCRIPTION:
 **      Various interesting constants and static variable
 **      initializer
@@ -62,15 +63,19 @@ PRInt64 __pascal __loadds __export
     LL_MinInt(void);
 PRInt64 __pascal __loadds __export
     LL_Zero(void);
+PRUint64 __pascal __loadds __export
+    LL_MaxUint(void);
 #else
 NSPR_API(PRInt64) LL_MaxInt(void);
 NSPR_API(PRInt64) LL_MinInt(void);
 NSPR_API(PRInt64) LL_Zero(void);
+NSPR_API(PRUint64) LL_MaxUint(void);
 #endif
 
 #define LL_MAXINT   LL_MaxInt()
 #define LL_MININT   LL_MinInt()
 #define LL_ZERO     LL_Zero()
+#define LL_MAXUINT  LL_MaxUint()
 
 #if defined(HAVE_LONG_LONG)
 
diff --git a/pr/src/md/unix/openvms.c b/pr/src/md/unix/openvms.c
index faa900e4..73d52314 100644
--- a/pr/src/md/unix/openvms.c
+++ b/pr/src/md/unix/openvms.c
@@ -223,6 +223,9 @@ int thread_resume(PRThread *thr_id) {
 ** realise and hadn't "nailed down". So we now need to nail it down
 ** to its Mozilla 1.1 position and have to insert 51 additional stubs
 ** in order to achive this (stubs 4-54).
+**
+** Over time some of these stubs will get reused by new symbols.
+**   - Stub54 is replaced by LL_MaxUint
 */
 
 void PR_VMS_Stub1(void) { }
@@ -278,4 +281,3 @@ void PR_VMS_Stub50(void) { }
 void PR_VMS_Stub51(void) { }
 void PR_VMS_Stub52(void) { }
 void PR_VMS_Stub53(void) { }
-void PR_VMS_Stub54(void) { }
diff --git a/pr/src/misc/prlong.c b/pr/src/misc/prlong.c
index df8d9e2e..31153293 100644
--- a/pr/src/misc/prlong.c
+++ b/pr/src/misc/prlong.c
@@ -37,6 +37,7 @@
 static PRInt64 ll_zero = LL_INIT( 0x00000000,0x00000000 );
 static PRInt64 ll_maxint = LL_INIT( 0x7fffffff, 0xffffffff );
 static PRInt64 ll_minint = LL_INIT( 0x80000000, 0x00000000 );
+static PRUint64 ll_maxuint = LL_INIT( 0xffffffff, 0xffffffff );
 
 #if defined(HAVE_WATCOM_BUG_2)
 PRInt64 __pascal __loadds __export
@@ -45,10 +46,13 @@ PRInt64 __pascal __loadds __export
     LL_MaxInt(void) { return ll_maxint; }
 PRInt64 __pascal __loadds __export
     LL_MinInt(void) { return ll_minint; }
+PRUint64 __pascal __loadds __export
+    LL_MaxUint(void) { return ll_maxuint; }
 #else
 PR_IMPLEMENT(PRInt64) LL_Zero(void) { return ll_zero; }
 PR_IMPLEMENT(PRInt64) LL_MaxInt(void) { return ll_maxint; }
 PR_IMPLEMENT(PRInt64) LL_MinInt(void) { return ll_minint; }
+PR_IMPLEMENT(PRUint64) LL_MaxUint(void) { return ll_maxuint; }
 #endif
 
 #ifndef HAVE_LONG_LONG
diff --git a/pr/src/nspr.def b/pr/src/nspr.def
index aa1d8417..a9b6295c 100644
--- a/pr/src/nspr.def
+++ b/pr/src/nspr.def
@@ -392,6 +392,7 @@ NSPR_4.1 {
 
 NSPR_4.3 {
 	global:
+		LL_MaxUint;
 		PR_CallOnceWithArg;
 		PR_GetLibraryFilePathname;
 } NSPR_4.1;
diff --git a/pr/src/nspr_symvec.opt b/pr/src/nspr_symvec.opt
index f6f5463d..68e78bdb 100644
--- a/pr/src/nspr_symvec.opt
+++ b/pr/src/nspr_symvec.opt
@@ -1,6 +1,6 @@
 ! Fixed section of symbol vector for LIBNSPR4 (non-debug)
 !
-GSMATCH=LEQUAL,2,4
+GSMATCH=LEQUAL,2,5
 case_sensitive=YES
 !
 ! --------------------------------------------------------------------------
@@ -28,6 +28,9 @@ case_sensitive=YES
 ! to its Mozilla 1.1 (and Java 1.4-0) location so that everyone can play
 ! together and be happy.
 ! --------------------------------------------------------------------------
+! Ident 2,5 introduced for post Mozilla 1.3.
+! LL_MaxUint introduced. Replaces Stub54.
+! --------------------------------------------------------------------------
 !
 SYMBOL_VECTOR=(PR_Accept=PROCEDURE)
 SYMBOL_VECTOR=(PR_AcceptRead=PROCEDURE)
@@ -422,7 +425,8 @@ SYMBOL_VECTOR=(PT_FPrintStats=PROCEDURE)
 SYMBOL_VECTOR=(SetExecutionEnvironment=PROCEDURE)
 !
 ! Start of 2,4 additions
-! 51 stubs so that PR_CreateThread ends up at 1B70.
+! 51 stubs (4 thru 54) so that PR_CreateThread ends up at 1B70.
+! Over time some of these stubs will get replaced by new symbols.
 !
 SYMBOL_VECTOR=(PR_VMS_Stub4=PROCEDURE)
 SYMBOL_VECTOR=(PR_VMS_Stub5=PROCEDURE)
@@ -474,7 +478,7 @@ SYMBOL_VECTOR=(PR_VMS_Stub50=PROCEDURE)
 SYMBOL_VECTOR=(PR_VMS_Stub51=PROCEDURE)
 SYMBOL_VECTOR=(PR_VMS_Stub52=PROCEDURE)
 SYMBOL_VECTOR=(PR_VMS_Stub53=PROCEDURE)
-SYMBOL_VECTOR=(PR_VMS_Stub54=PROCEDURE)
+SYMBOL_VECTOR=(LL_MaxUint=PROCEDURE)
 !
 SYMBOL_VECTOR=(PR_CallOnceWithArg=PROCEDURE)
 SYMBOL_VECTOR=(PR_GetLibraryFilePathname=PROCEDURE)