summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralexei.volkov.bugs%sun.com <devnull@localhost>2008-03-26 19:49:10 +0000
committeralexei.volkov.bugs%sun.com <devnull@localhost>2008-03-26 19:49:10 +0000
commit8c2e50a9e0bb640b235c07bbd61557a56a7ca99d (patch)
treee75701f7963db3ac3bce7ccfab645522cccdf6b0
parent97412bfb962279506fd1b7720311395b6d76424a (diff)
downloadnss-hg-8c2e50a9e0bb640b235c07bbd61557a56a7ca99d.tar.gz
fix tinderbox: can not use macro to modify macro.
-rwxr-xr-xsecurity/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c b/security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
index 20adac974..49de05e19 100755
--- a/security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
@@ -609,14 +609,17 @@ PKIX_PL_Object_Alloc(
#ifdef PKIX_OBJECT_LEAK_TEST
PKIX_CHECK(PKIX_PL_Calloc
(1,
- ((PKIX_UInt32)sizeof (PKIX_PL_Object))+size,
+ ((PKIX_UInt32)sizeof (PKIX_PL_Object))+size,
+ (void **)&object,
+ plContext),
+ PKIX_MALLOCFAILED);
#else
PKIX_CHECK(PKIX_PL_Malloc
(((PKIX_UInt32)sizeof (PKIX_PL_Object))+size,
-#endif /* PKIX_OBJECT_LEAK_TEST */
(void **)&object,
plContext),
PKIX_MALLOCFAILED);
+#endif /* PKIX_OBJECT_LEAK_TEST */
/* Initialize all object fields */
object->magicHeader = PKIX_MAGIC_HEADER;