diff --git a/mozilla/embedding/browser/gtk/tests/Makefile.in b/mozilla/embedding/browser/gtk/tests/Makefile.in
index cb89461d59d..9eb984a45aa 100644
--- a/mozilla/embedding/browser/gtk/tests/Makefile.in
+++ b/mozilla/embedding/browser/gtk/tests/Makefile.in
@@ -71,8 +71,6 @@ endif
 
 include $(topsrcdir)/config/config.mk
 
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
-
 include $(topsrcdir)/config/rules.mk
 
 LIBS += $(XPCOM_STANDALONE_GLUE_LDOPTS)
diff --git a/mozilla/xpcom/glue/nsDebug.h b/mozilla/xpcom/glue/nsDebug.h
index d892f7da61e..b5b62d744e1 100644
--- a/mozilla/xpcom/glue/nsDebug.h
+++ b/mozilla/xpcom/glue/nsDebug.h
@@ -50,7 +50,6 @@
 
 #ifdef DEBUG
 #define NS_DEBUG
-#include "prprf.h"
 #endif
 
 #ifdef DEBUG
@@ -204,29 +203,8 @@
 ** Macros for checking results
 ******************************************************************************/
 
-#ifdef DEBUG
-/* So, if you are wondering why on Earth would anyone need to store res in __rv,
- * please consider the case where res is a function call.  We clearly only want
- * to call this function once, so we store its result in __rv.
- */
-#define NS_ENSURE_SUCCESS(res, ret)                                       \
-  PR_BEGIN_MACRO                                                          \
-  nsresult __rv = res;                                                    \
-  if (NS_FAILED(__rv)) {                                                  \
-    static const char format[] = "NS_ENSURE_SUCCESS(" #res ", " #ret ") " \
-      "failed with result 0x%X";                                          \
-    char *msg = PR_smprintf(format, __rv);                                \
-    NS_WARNING(msg);                                                      \
-    PR_smprintf_free(msg);                                                \
-    return ret;                                                           \
-  }                                                                       \
-  PR_END_MACRO
-#else
 #define NS_ENSURE_SUCCESS(res, ret) \
-  PR_BEGIN_MACRO                    \
-  if (NS_FAILED(res)) return ret;   \
-  PR_END_MACRO
-#endif
+  NS_ENSURE_TRUE(NS_SUCCEEDED(res), ret)
 
 /******************************************************************************
 ** Macros for checking state and arguments upon entering interface boundaries