Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/base/arena.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * arena.c
  *
  * This contains the implementation of NSS's thread-safe arenas.
  */
 
@@ skipping 686 matching lines @@
 #ifdef ARENA_DESTRUCTOR_LIST
     if( (struct arena_destructor_node *)NULL != arenaMark->prev_destructor ) {
       arenaMark->prev_destructor->next = (struct arena_destructor_node *)NULL;
     }
     arena->last_destructor = arenaMark->prev_destructor;
 
     /* Note that the arena is locked at this time */
     nss_arena_call_destructor_chain(arenaMark->next_destructor);
 #endif /* ARENA_DESTRUCTOR_LIST */
 
-    PR_ARENA_RELEASE(&arena->pool, inner_mark);
+    PL_ARENA_RELEASE(&arena->pool, inner_mark);
     /* No error return */
   }
 
   PR_Unlock(arena->lock);
   return PR_SUCCESS;
 }
 
 /*
  * nssArena_Release
  *
@@ skipping 72 matching lines @@
 nss_zalloc_arena_locked
 (
   NSSArena *arena,
   PRUint32 size
 )
 {
   void *p;
   void *rv;
   struct pointer_header *h;
   PRUint32 my_size = size + sizeof(struct pointer_header);
-  PR_ARENA_ALLOCATE(p, &arena->pool, my_size);
+  PL_ARENA_ALLOCATE(p, &arena->pool, my_size);
   if( (void *)NULL == p ) {
     nss_SetError(NSS_ERROR_NO_MEMORY);
     return (void *)NULL;
   }
   /* 
    * Do this before we unlock.  This way if the user is using
    * an arena in one thread while destroying it in another, he'll
    * fault/FMR in his code, not ours.
    */
   h = (struct pointer_header *)p;
@@ skipping 361 matching lines @@
        * if the user reallocs back up to something not greater than
        * the original size, then voila, there's the memory!  This
        * way a thrash big/small/big/small doesn't burn up the arena.
        */
       char *extra = &((char *)pointer)[ newSize ];
       (void)nsslibc_memset(extra, 0, (h->size - newSize));
       PR_Unlock(arena->lock);
       return pointer;
     }
 
-    PR_ARENA_ALLOCATE(p, &arena->pool, my_newSize);
+    PL_ARENA_ALLOCATE(p, &arena->pool, my_newSize);
     if( (void *)NULL == p ) {
       PR_Unlock(arena->lock);
       nss_SetError(NSS_ERROR_NO_MEMORY);
       return (void *)NULL;
     }
 
     new_h = (struct pointer_header *)p;
     new_h->arena = arena;
     new_h->size = newSize;
     rv = (void *)((char *)new_h + sizeof(struct pointer_header));
@@ skipping 12 matching lines @@
 
 PRStatus 
 nssArena_Shutdown(void)
 {
   PRStatus rv = PR_SUCCESS;
 #ifdef DEBUG
   rv = nssPointerTracker_finalize(&arena_pointer_tracker);
 #endif
   return rv;
 }