diff options
| author | kirk.erickson%sun.com <devnull@localhost> | 2002-10-31 19:17:54 +0000 |
|---|---|---|
| committer | kirk.erickson%sun.com <devnull@localhost> | 2002-10-31 19:17:54 +0000 |
| commit | 80a73a88f7193e3cfb961c8a32caa36ba2c855ed (patch) | |
| tree | 9c3923ac9c47d158e60595a5b80c30588a3b2913 | |
| parent | ac023191142ef3007073fec84a7a25ab66ee0fd7 (diff) | |
| download | nspr-hg-80a73a88f7193e3cfb961c8a32caa36ba2c855ed.tar.gz | |
Map PROrderedLock and methods onto PRLock when ordered locking
is not compiled in. Eliminated duplicate in prtrace.h.
| -rw-r--r-- | pr/include/prolock.h | 11 | ||||
| -rw-r--r-- | pr/include/prtrace.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pr/include/prolock.h b/pr/include/prolock.h index e65f8aa5..f29a27e7 100644 --- a/pr/include/prolock.h +++ b/pr/include/prolock.h @@ -78,7 +78,18 @@ PR_BEGIN_EXTERN_C ** */ +#if defined(DEBUG) || defined(FORCE_NSPR_ORDERED_LOCKS) typedef void * PROrderedLock; +#else +/* +** Map PROrderedLock and methods onto PRLock when ordered locking +** is not compiled in. +** +*/ +#include <prlock.h> + +typedef PRLock PROrderedLock; +#endif /* ----------------------------------------------------------------------- ** FUNCTION: PR_CreateOrderedLock() -- Create an Ordered Lock diff --git a/pr/include/prtrace.h b/pr/include/prtrace.h index ac388f58..ebfe1baf 100644 --- a/pr/include/prtrace.h +++ b/pr/include/prtrace.h @@ -140,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 |