Bug 807883: Update NSPR to NSPR 4.9.6 Beta 2. This adds 'const' to the

'pool' input parameter of PL_SizeOfArenaPoolExcludingPool. r=n.nethercote.

nsprpub/TAG-INFO

@@ -1 +1 @@
-NSPR_4_9_6_BETA1
+NSPR_4_9_6_BETA2

nsprpub/config/prdepend.h

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

nsprpub/lib/ds/plarena.c

@@ -346,14 +346,14 @@ PR_IMPLEMENT(void) PL_ArenaFinish(void)
 }
 
 PR_IMPLEMENT(size_t) PL_SizeOfArenaPoolExcludingPool(
-    PLArenaPool *pool, PLMallocSizeFn mallocSizeOf)
+    const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf)
 {
     /*
      * The first PLArena is within |pool|, so don't measure it.  Subsequent
-     * PLArenas are separate and must measured.
+     * PLArenas are separate and must be measured.
      */
     size_t size = 0;
-    PLArena *arena = pool->first.next;
+    const PLArena *arena = pool->first.next;
     while (arena) {
         size += mallocSizeOf(arena);
         arena = arena->next;

nsprpub/lib/ds/plarenas.h

@@ -61,17 +61,17 @@ PR_EXTERN(void) PL_ArenaRelease(PLArenaPool *pool, char *mark);
 PR_EXTERN(void) PL_ClearArenaPool(PLArenaPool *pool, PRInt32 pattern);
 
 /*
-** A function like malloc_size() or malloc_usable_size() that returns the
+** A function like malloc_size() or malloc_usable_size() that measures the
 ** size of a heap block.
 */
 typedef size_t (*PLMallocSizeFn)(const void *ptr);
 
 /*
-** Return all memory used by a PLArenaPool, excluding the PLArenaPool
+** Measure all memory used by a PLArenaPool, excluding the PLArenaPool
 ** structure.
 */
 PR_EXTERN(size_t) PL_SizeOfArenaPoolExcludingPool(
-    PLArenaPool *pool, PLMallocSizeFn mallocSizeOf);
+    const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf);
 
 PR_END_EXTERN_C