diff --git a/nsprpub/pr/include/prmem.h b/nsprpub/pr/include/prmem.h
index b65128c80246..4420adb19409 100644
--- a/nsprpub/pr/include/prmem.h
+++ b/nsprpub/pr/include/prmem.h
@@ -121,7 +121,10 @@ NSPR_API(void) PR_Free(void *ptr);
 ** OUTPUTS:	the referenced object is returned to the heap
 ** RETURN:	void
 ***********************************************************************/
-#define PR_DELETE(_ptr) { PR_Free(_ptr); (_ptr) = NULL; }
+#define PR_DELETE(_ptr)                 \
+    PR_BEGIN_MACRO                      \
+        PR_Free(_ptr); (_ptr) = NULL;   \
+    PR_END_MACRO
 
 /***********************************************************************
 ** FUNCTION:	PR_FREEIF()
@@ -133,7 +136,10 @@ NSPR_API(void) PR_Free(void *ptr);
 ** OUTPUTS:	the referenced object is conditionally returned to the heap
 ** RETURN:	void
 ***********************************************************************/
-#define PR_FREEIF(_ptr)	if (_ptr) PR_DELETE(_ptr)
+#define PR_FREEIF(_ptr)             \
+    PR_BEGIN_MACRO                  \
+        if (_ptr) PR_DELETE(_ptr);  \
+    PR_END_MACRO
 
 PR_END_EXTERN_C