Removed common_files/depend from pkg/solaris.

Fixed type in copyright file.
Made OPT build compile what were DBG only symbols,
and adjusted header files to make the corresponding macros
noops unless FORCE_* is turned on.  Now counter, olock,
and trace are like PR_Log in this respect.  Reintroduced
the "debug" only symbols into nspr.def so OPT and DBG
maps are identical and include the full symbol set.

10 files changed, 146 insertions, 175 deletions

diff --git a/pkg/solaris/SUNWpr/Makefile b/pkg/solaris/SUNWpr/Makefile
index b312d986..761fa00a 100644
--- a/pkg/solaris/SUNWpr/Makefile
+++ b/pkg/solaris/SUNWpr/Makefile
@@ -8,7 +8,7 @@
 MOD_DEPTH = ../../..
 include ../Makefile.com
 
-DATAFILES += depend
+DATAFILES += 
 
 all:: $(FILES)
 publish:: all pkg
diff --git a/pkg/solaris/SUNWpr/copyright b/pkg/solaris/SUNWpr/copyright
deleted file mode 100644
index 1e0f6ce3..00000000
--- a/pkg/solaris/SUNWpr/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-The contents of this package are subject to the Mozilla Public License
-Version 1.1 (the "License"); you may not use this package except in
-compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the Netscape Portable Runtime (NSPR).
-
-The Initial Developer of the Original Code is Netscape Communications
-Corporation.  Portions created by Netscape are Copyright (C) 1998-2000
-Netscape Communications Corporation.  All Rights Reserved.
-
-Contributor(s):
-
-Alternatively, the contents of this package may be used under the terms
-of the GNU General Public License Version 2 or later (the "GPL"), in
-which case the provisions of the GPL are applicable instead of those
-above.  If you wish to allow use of your version of this package only
-under the terms of the GPL and not to allow others to use your version
-of this package under the MPL, indicate your decision by deleting the
-provisions above and replace them with the notice and other provisions
-required by the GPL.  If you do not delete the provisions above, a
-recipient may use your version of this package under either the MPL or
-the GPL.
diff --git a/pkg/solaris/common_files/depend b/pkg/solaris/common_files/depend
deleted file mode 100644
index 11d87b87..00000000
--- a/pkg/solaris/common_files/depend
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2002 Microsystems, Inc.  All Rights Reserved.
-# Use is subject to license terms.
-#
-#	$Id$
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
diff --git a/pr/include/prcountr.h b/pr/include/prcountr.h
index 1a7d1456..105135f1 100644
--- a/pr/include/prcountr.h
+++ b/pr/include/prcountr.h
@@ -116,7 +116,6 @@ typedef void *  PRCounterHandle;
 #define PRCOUNTER_DESC_MAX 255
 
 
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 
 /* -----------------------------------------------------------------------
 ** FUNCTION: PR_DEFINE_COUNTER() -- Define a PRCounterHandle
@@ -135,8 +134,12 @@ typedef void *  PRCounterHandle;
 ** to value.
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_INIT_COUNTER_HANDLE(handle,value)\
     (handle) = (PRCounterHandle)(value)
+#else
+#define PR_INIT_COUNTER_HANDLE(handle,value)
+#endif
 
 /* -----------------------------------------------------------------------
 ** FUNCTION: PR_CreateCounter() -- Create a counter
@@ -167,8 +170,12 @@ typedef void *  PRCounterHandle;
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_CREATE_COUNTER(handle,qName,rName,description)\
    (handle) = PR_CreateCounter((qName),(rName),(description))
+#else
+#define PR_CREATE_COUNTER(handle,qName,rName,description)
+#endif
 
 NSPR_API(PRCounterHandle) 
 	PR_CreateCounter( 
@@ -194,7 +201,11 @@ NSPR_API(PRCounterHandle)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_DESTROY_COUNTER(handle) PR_DestroyCounter((handle))
+#else
+#define PR_DESTROY_COUNTER(handle)
+#endif
 
 NSPR_API(void) 
 	PR_DestroyCounter( 
@@ -222,8 +233,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)\
     (handle) = PR_GetCounterHandleFromName((qName),(rName))
+#else
+#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)
+#endif
 
 NSPR_API(PRCounterHandle) 
 	PR_GetCounterHandleFromName( 
@@ -251,8 +266,12 @@ NSPR_API(PRCounterHandle)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description)\
     PR_GetCounterNameFromHandle((handle),(qName),(rName),(description))
+#else
+#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description )
+#endif
 
 NSPR_API(void) 
 	PR_GetCounterNameFromHandle( 
@@ -279,7 +298,11 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_INCREMENT_COUNTER(handle) PR_IncrementCounter(handle)
+#else
+#define PR_INCREMENT_COUNTER(handle)
+#endif
 
 NSPR_API(void) 
 	PR_IncrementCounter( 
@@ -304,7 +327,11 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_DECREMENT_COUNTER(handle) PR_DecrementCounter(handle)
+#else
+#define PR_DECREMENT_COUNTER(handle)
+#endif
 
 NSPR_API(void) 
 	PR_DecrementCounter( 
@@ -328,8 +355,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_ADD_TO_COUNTER(handle,value)\
     PR_AddToCounter((handle),(value))
+#else
+#define PR_ADD_TO_COUNTER(handle,value)
+#endif
 
 NSPR_API(void) 
 	PR_AddToCounter( 
@@ -358,8 +389,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_SUBTRACT_FROM_COUNTER(handle,value)\
     PR_SubtractFromCounter((handle),(value))
+#else
+#define PR_SUBTRACT_FROM_COUNTER(handle,value)
+#endif
 
 NSPR_API(void) 
 	PR_SubtractFromCounter( 
@@ -384,8 +419,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_GET_COUNTER(counter,handle)\
     (counter) = PR_GetCounter((handle))
+#else
+#define PR_GET_COUNTER(counter,handle) 0
+#endif
 
 NSPR_API(PRUint32) 
 	PR_GetCounter( 
@@ -412,7 +451,11 @@ NSPR_API(PRUint32)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_SET_COUNTER(handle,value) PR_SetCounter((handle),(value))
+#else
+#define PR_SET_COUNTER(handle,value)
+#endif
 
 NSPR_API(void) 
 	PR_SetCounter( 
@@ -450,8 +493,12 @@ NSPR_API(void)
 ** operations may cause unpredictable results.
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\
     (next) = PR_FindNextCounterQname((handle))
+#else
+#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
+#endif
 
 NSPR_API(PRCounterHandle) 
 	PR_FindNextCounterQname( 
@@ -489,8 +536,12 @@ NSPR_API(PRCounterHandle)
 ** operations may cause unpredictable results.
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)\
     (next) = PR_FindNextCounterRname((rhandle),(qhandle))
+#else
+#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)
+#endif
 
 NSPR_API(PRCounterHandle) 
 	PR_FindNextCounterRname( 
@@ -498,31 +549,6 @@ NSPR_API(PRCounterHandle)
         PRCounterHandle qhandle
 );
 
-
-#else /* ( !(defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)) */
-/*
-** When counters are not compiled in, provide macros that 
-** evaluate to No-Ops.
-**
-*/
-
-#define PR_DEFINE_COUNTER(name) PRCounterHandle name
-#define PR_INIT_COUNTER_HANDLE(handle,value)
-#define PR_CREATE_COUNTER(handle,qName,rName,description)
-#define PR_DESTROY_COUNTER(handle)
-#define PR_GET_COUNTER_HANDLE_FROM_NAME(handle,qName,rName)
-#define PR_GET_COUNTER_NAME_FROM_HANDLE(handle,qName,rName,description )
-#define PR_INCREMENT_COUNTER(handle)
-#define PR_DECREMENT_COUNTER(handle)
-#define PR_ADD_TO_COUNTER(handle,value)
-#define PR_SUBTRACT_FROM_COUNTER(handle,value)
-#define PR_GET_COUNTER(counter,handle) 0
-#define PR_SET_COUNTER(handle,value)
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
-#define PR_FIND_NEXT_COUNTER_RNAME(next,rhandle,qhandle)
-
-#endif /* ( !(defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)) */
-
 PR_END_EXTERN_C
 
 #endif /* prcountr_h___ */
diff --git a/pr/include/prolock.h b/pr/include/prolock.h
index 80b92e17..e65f8aa5 100644
--- a/pr/include/prolock.h
+++ b/pr/include/prolock.h
@@ -39,8 +39,6 @@
 
 PR_BEGIN_EXTERN_C
 
-#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
-
 /*
 ** A locking mechanism, built on the existing PRLock definiion,
 ** is provided that will permit applications to define a Lock
@@ -98,8 +96,12 @@ typedef void * PROrderedLock;
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
 #define PR_CREATE_ORDERED_LOCK(order,name)\
     PR_CreateOrderedLock((order),(name))
+#else
+#define PR_CREATE_ORDERED_LOCK(order) PR_NewLock()
+#endif
 
 NSPR_API(PROrderedLock *) 
     PR_CreateOrderedLock( 
@@ -122,7 +124,11 @@ NSPR_API(PROrderedLock *)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
 #define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyOrderedLock((lock))
+#else
+#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyLock((lock))
+#endif
 
 NSPR_API(void) 
     PR_DestroyOrderedLock( 
@@ -146,7 +152,11 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
 #define PR_LOCK_ORDERED_LOCK(lock) PR_LockOrderedLock((lock))
+#else
+#define PR_LOCK_ORDERED_LOCK(lock) PR_Lock((lock))
+#endif
 
 NSPR_API(void) 
     PR_LockOrderedLock( 
@@ -170,43 +180,17 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)
 #define PR_UNLOCK_ORDERED_LOCK(lock) PR_UnlockOrderedLock((lock))
+#else
+#define PR_UNLOCK_ORDERED_LOCK(lock) PR_Unlock((lock))
+#endif
 
 NSPR_API(PRStatus) 
     PR_UnlockOrderedLock( 
         PROrderedLock *lock 
 );
 
-#else /* !(defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)) */
-/*
-** Map PROrderedLock and methods onto PRLock when ordered locking
-** is not compiled in.
-**  
-*/
-#include <prlock.h>
-
-typedef PRLock PROrderedLock;
-
-#define PR_CREATE_ORDERED_LOCK(order) PR_NewLock()
-#define PR_DESTROY_ORDERED_LOCK(lock) PR_DestroyLock((lock))
-#define PR_LOCK_ORDERED_LOCK(lock) PR_Lock((lock))
-#define PR_UNLOCK_ORDERED_LOCK(lock) PR_Unlock((lock))
-
-#endif /* !(defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS)) */
-
 PR_END_EXTERN_C
 
 #endif /* prolock_h___ */
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pr/include/prtrace.h b/pr/include/prtrace.h
index 9b0b0bb8..ac388f58 100644
--- a/pr/include/prtrace.h
+++ b/pr/include/prtrace.h
@@ -103,7 +103,6 @@ PR_BEGIN_EXTERN_C
 */
 typedef void *  PRTraceHandle;
 
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 /*
 ** PRTraceEntry -- A trace entry in the in-memory trace buffer
 ** looks like this.
@@ -141,9 +140,9 @@ typedef enum PRTraceOption
 ** 
 ** DESCRIPTION: PR_DEFINE_TRACE() is used to define a trace
 ** handle.
-** 
 */
 #define PR_DEFINE_TRACE(name) PRTraceHandle name
+#define PR_DEFINE_TRACE(name) PRTraceHandle name
 
 /* -----------------------------------------------------------------------
 ** FUNCTION: PR_INIT_TRACE_HANDLE() -- Set the value of a PRTraceHandle
@@ -153,8 +152,12 @@ typedef enum PRTraceOption
 ** to value. e.g. PR_INIT_TRACE_HANDLE( myHandle, NULL );
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_INIT_TRACE_HANDLE(handle,value)\
     (handle) = (PRCounterHandle)(value)
+#else
+#define PR_INIT_TRACE_HANDLE(handle,value)
+#endif
 
 
 /* -----------------------------------------------------------------------
@@ -192,8 +195,12 @@ typedef enum PRTraceOption
 #define PRTRACE_NAME_MAX 31
 #define PRTRACE_DESC_MAX 255
 
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_CREATE_TRACE(handle,qName,rName,description)\
     (handle) = PR_CreateTrace((qName),(rName),(description))
+#else
+#define PR_CREATE_TRACE(handle,qName,rName,description)
+#endif
 
 NSPR_API(PRTraceHandle)
 	PR_CreateTrace( 
@@ -222,8 +229,12 @@ NSPR_API(PRTraceHandle)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_DESTROY_TRACE(handle)\
     PR_DestroyTrace((handle))
+#else
+#define PR_DESTROY_TRACE(handle)
+#endif
 
 NSPR_API(void) 
 	PR_DestroyTrace( 
@@ -259,8 +270,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)\
     PR_Trace((handle),(ud0),(ud1),(ud2),(ud3),(ud4),(ud5),(ud6),(ud7))
+#else
+#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)
+#endif
 
 NSPR_API(void) 
 	PR_Trace( 
@@ -342,8 +357,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_SET_TRACE_OPTION(command,value)\
     PR_SetTraceOption((command),(value))
+#else
+#define PR_SET_TRACE_OPTION(command,value)
+#endif
 
 NSPR_API(void) 
 	PR_SetTraceOption( 
@@ -376,8 +395,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_GET_TRACE_OPTION(command,value)\
     PR_GetTraceOption((command),(value))
+#else
+#define PR_GET_TRACE_OPTION(command,value)
+#endif
 
 NSPR_API(void) 
 	PR_GetTraceOption( 
@@ -408,8 +431,12 @@ NSPR_API(void)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)\
     (handle) = PR_GetTraceHandleFromName((qName),(rName))
+#else
+#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)
+#endif
 
 NSPR_API(PRTraceHandle) 
 	PR_GetTraceHandleFromName( 
@@ -436,8 +463,12 @@ NSPR_API(PRTraceHandle)
 ** RESTRICTIONS:
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)\
     PR_GetTraceNameFromHandle((handle),(qName),(rName),(description))
+#else
+#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)
+#endif
 
 NSPR_API(void) 
 	PR_GetTraceNameFromHandle( 
@@ -474,8 +505,12 @@ NSPR_API(void)
 ** See: PR_SetTraceOption( PRLockTraceHandles ).
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_FIND_NEXT_TRACE_QNAME(next,handle)\
     (next) = PR_FindNextTraceQname((handle))
+#else
+#define PR_FIND_NEXT_TRACE_QNAME(next,handle)
+#endif
 
 NSPR_API(PRTraceHandle) 
 	PR_FindNextTraceQname( 
@@ -512,8 +547,12 @@ NSPR_API(PRTraceHandle)
 ** PR_SetTraceOption( PRLockTraceHandles ).
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)\
     (next) = PR_FindNextTraceRname((rhandle),(qhandle))
+#else
+#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)
+#endif
 
 NSPR_API(PRTraceHandle) 
 	PR_FindNextTraceRname( 
@@ -564,8 +603,12 @@ NSPR_API(PRTraceHandle)
 ** On error, PR_RecordTraceEntries() may return prematurely.
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_RECORD_TRACE_ENTRIES()\
 	PR_RecordTraceEntries()
+#else
+#define PR_RECORD_TRACE_ENTRIES()
+#endif
     
 NSPR_API(void)
 	PR_RecordTraceEntries(
@@ -612,9 +655,12 @@ NSPR_API(void)
 ** application may be realized. ... YMMV.
 ** 
 */
+#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #define PR_GET_TRACE_ENTRIES(buffer,count,found)\
         PR_GetTraceEntries((buffer),(count),(found))
-
+#else
+#define PR_GET_TRACE_ENTRIES(buffer,count,found)
+#endif
 
 NSPR_API(PRIntn)
     PR_GetTraceEntries(
@@ -623,28 +669,6 @@ NSPR_API(PRIntn)
         PRInt32         *found      /* number you got */
 );
 
-#else /* !(defined (DEBUG) || defined (FORCE_NSPR_TRACE)) */
-/*
-** Define the Trace Facility macros as No-Ops for when the trace
-** facility is to be compiled-out of the application.
-**
-*/
-#define PR_DEFINE_TRACE(name) PRTraceHandle name
-#define PR_INIT_TRACE_HANDLE(handle,value)
-#define PR_CREATE_TRACE(handle,qName,rName,description)
-#define PR_DESTROY_TRACE(handle)
-#define PR_TRACE(handle,ud0,ud1,ud2,ud3,ud4,ud5,ud6,ud7)
-#define PR_SET_TRACE_OPTION(command,value)
-#define PR_GET_TRACE_OPTION(command,value)
-#define PR_GET_TRACE_HANDLE_FROM_NAME(handle,qName,rName)
-#define PR_GET_TRACE_NAME_FROM_HANDLE(handle,qName,rName,description)
-#define PR_FIND_NEXT_TRACE_QNAME(next,handle)
-#define PR_FIND_NEXT_TRACE_RNAME(next,rhandle,qhandle)
-#define PR_GET_TRACE_ENTRIES(buffer,count,found)
-#define PR_RECORD_TRACE_ENTRIES()
-
-#endif /* !(defined (DEBUG) || defined (FORCE_NSPR_TRACE)) */
-
 PR_END_EXTERN_C
 
 #endif /* prtrace_h___ */
diff --git a/pr/src/misc/prcountr.c b/pr/src/misc/prcountr.c
index 850f7bcd..b5f6ae23 100644
--- a/pr/src/misc/prcountr.c
+++ b/pr/src/misc/prcountr.c
@@ -68,7 +68,6 @@
 **
 */
 
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #include "prcountr.h"
 #include "prclist.h"
 #include "prlock.h"
@@ -502,14 +501,3 @@ PR_IMPLEMENT(PRCounterHandle)
 
     return((PRCounterHandle)rnp);
 } /*  end PR_FindNextCounterRname() */
-
-
-#else  /* !(defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)) */
-/*
-** NSPR Counters are not defined in this case
-**
-**
-*/
-/* Some compilers don't like an empty compilation unit. */
-static int dummy = 0;
-#endif /* defined(DEBUG) || defined(FORCE_NSPR_COUNTERS) */
diff --git a/pr/src/misc/prolock.c b/pr/src/misc/prolock.c
index a2a50ced..e8384879 100644
--- a/pr/src/misc/prolock.c
+++ b/pr/src/misc/prolock.c
@@ -38,7 +38,6 @@
 **  Implement the API defined in prolock.h
 ** 
 */
-#if defined(DEBUG) || defined(FORCE_NSPR_COUNTERS)
 #include "prolock.h"
 #include "prlog.h"
 #include "prerror.h"
@@ -96,13 +95,3 @@ PR_IMPLEMENT(PRStatus)
     PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
     return PR_FAILURE;
 } /*  end PR_UnlockOrderedLock() */
-
-#else /* ! defined(FORCE_NSPR_ORDERED_LOCK) */
-/*
-** NSPR Ordered Lock is not defined when !DEBUG and !FORCE_NSPR_ORDERED_LOCK
-**  
-*/
-
-/* Some compilers don't like an empty compilation unit. */
-static int dummy = 0;
-#endif /* defined(FORCE_NSPR_ORDERED_LOCK */
diff --git a/pr/src/misc/prtrace.c b/pr/src/misc/prtrace.c
index 72b9c52d..469b72fc 100644
--- a/pr/src/misc/prtrace.c
+++ b/pr/src/misc/prtrace.c
@@ -41,7 +41,6 @@
 **
 */
 
-#if defined (DEBUG) || defined (FORCE_NSPR_TRACE)
 #include <string.h>
 #include "prtrace.h"
 #include "prclist.h"
@@ -916,15 +915,3 @@ PR_IMPLEMENT(PRIntn)
     PR_Unlock( traceLock );
     return rc;
 } /* end PR_GetTraceEntries() */
-
-#else /* !defined(FORCE_NSPR_TRACE) */
-/*
-** The trace facility is not defined when !DEBUG and !FORCE_NSPR_TRACE
-**
-*/
-
-/* Some compilers don't like an empty compilation unit. */
-static int dummy = 0;
-#endif /* defined(FORCE_NSPR_TRACE) */
-
-/* end prtrace.c */
diff --git a/pr/src/nspr.def b/pr/src/nspr.def
index c4fbb36c..d5e063d7 100644
--- a/pr/src/nspr.def
+++ b/pr/src/nspr.def
@@ -5,6 +5,7 @@ NSPR_4.0 {
 		LL_MinInt;
 		LL_Zero;
 		PR_Abort;
+		PR_AddToCounter;
 		PR_Accept;
 		PR_AcceptRead;
 		PR_Access;
@@ -44,10 +45,12 @@ NSPR_4.0 {
 		PR_CloseSemaphore;
 		PR_CloseSharedMemory;
 		PR_Connect;
+		PR_CreateCounter;
 		PR_ConvertIPv4AddrToIPv6;
 		PR_CreateAlarm;
 		PR_CreateFileMap;
 		PR_CreateIOLayerStub;
+		PR_CreateOrderedLock;
 		PR_CreateMWaitEnumerator;
 		PR_CreatePipe;
 		PR_CreateProcess;
@@ -56,21 +59,26 @@ NSPR_4.0 {
 		PR_CreateStack;
 		PR_CreateThread;
 		PR_CreateThreadGCAble;
+		PR_CreateTrace;
 		PR_CreateThreadPool;
+		PR_DecrementCounter;
 		PR_CreateWaitGroup;
 		PR_Delete;
 		PR_DeleteSemaphore;
 		PR_DeleteSharedMemory;
 		PR_DestroyAlarm;
+		PR_DestroyCounter;
 		PR_DestroyCondVar;
 		PR_DestroyLock;
 		PR_DestroyMWaitEnumerator;
+		PR_DestroyOrderedLock;
 		PR_DestroyMonitor;
 		PR_DestroyPollableEvent;
 		PR_DestroyProcessAttr;
 		PR_DestroyRWLock;
 		PR_DestroySem;
 		PR_DestroySocketPollFd;
+		PR_DestroyTrace;
 		PR_DestroyStack;
 		PR_DestroyWaitGroup;
 		PR_DetachProcess;
@@ -102,6 +110,10 @@ NSPR_4.0 {
 		PR_FindSymbolAndLibrary;
 		PR_FloorLog2;
 		PR_FormatTime;
+		PR_FindNextCounterQname;
+		PR_FindNextCounterRname;
+		PR_FindNextTraceQname;
+		PR_FindNextTraceRname;
 		PR_FormatTimeUSEnglish;
 		PR_Free;
 		PR_FreeLibraryName;
@@ -111,6 +123,9 @@ NSPR_4.0 {
 		PR_GetDefaultIOMethods;
 		PR_GetDescType;
 		PR_GetDirectorySeparator;
+		PR_GetCounter;
+		PR_GetCounterHandleFromName;
+		PR_GetCounterNameFromHandle;
 		PR_GetDirectorySepartor;
 		PR_GetEnv;
 		PR_GetError;
@@ -146,6 +161,7 @@ NSPR_4.0 {
 		PR_GetSocketOption;
 		PR_GetSpecialFD;
 		PR_GetStackSpaceLeft;
+		PR_GetSysfdTableMax;
 		PR_GetSystemInfo;
 		PR_GetTCPMethods;
 		PR_GetThreadAffinityMask;
@@ -162,6 +178,10 @@ NSPR_4.0 {
 		PR_ImportFileMapFromString;
 		PR_ImportTCPSocket;
 		PR_ImportUDPSocket;
+		PR_GetTraceEntries;
+		PR_GetTraceHandleFromName;
+		PR_GetTraceNameFromHandle;
+		PR_GetTraceOption;
 		PR_Init;
 		PR_Initialize;
 		PR_InitializeNetAddr;
@@ -170,6 +190,7 @@ NSPR_4.0 {
 		PR_IntervalNow;
 		PR_IntervalToMicroseconds;
 		PR_IntervalToMilliseconds;
+		PR_IncrementCounter;
 		PR_IntervalToSeconds;
 		PR_IsNetAddrType;
 		PR_JoinJob;
@@ -191,6 +212,7 @@ NSPR_4.0 {
 		PR_MemUnmap;
 		PR_MicrosecondsToInterval;
 		PR_MillisecondsToInterval;
+		PR_LockOrderedLock;
 		PR_MkDir;
 		PR_NetAddrToString;
 		PR_NewCondVar;
@@ -251,6 +273,7 @@ NSPR_4.0 {
 		PR_ResumeAll;
 		PR_RmDir;
 		PR_ScanStackPointers;
+		PR_RecordTraceEntries;
 		PR_SecondsToInterval;
 		PR_Seek;
 		PR_Seek64;
@@ -270,6 +293,7 @@ NSPR_4.0 {
 		PR_SetNetAddr;
 		PR_SetPollableEvent;
 		PR_SetSocketOption;
+		PR_SetCounter;
 		PR_SetStdioRedirect;
 		PR_SetThreadAffinityMask;
 		PR_SetThreadDumpProc;
@@ -289,18 +313,21 @@ NSPR_4.0 {
 		PR_Sync;
 		PR_TLockFile;
 		PR_ThreadScanStackPointers;
+		PR_SetTraceOption;
 		PR_TicksPerSecond;
 		PR_TransmitFile;
 		PR_USPacificTimeParameters;
 		PR_UnblockClockInterrupts;
 		PR_UnblockInterrupt;
 		PR_UnloadLibrary;
+		PR_SubtractFromCounter;
 		PR_Unlock;
 		PR_UnlockFile;
 		PR_VersionCheck;
 		PR_Wait;
 		PR_WaitCondVar;
 		PR_WaitForPollableEvent;
+		PR_Trace;
 		PR_WaitProcess;
 		PR_WaitRecvReady;
 		PR_WaitSem;
@@ -308,6 +335,7 @@ NSPR_4.0 {
 		PR_Write;
 		PR_Writev;
 		PR_Yield;
+		PR_UnlockOrderedLock;
 		PR_cnvtf;
 		PR_dtoa;
 		PR_fprintf;