Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out bug 392055 due to bustage

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@236540 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com
2007-09-24 03:44:29 +00:00
parent 3789de690e
commit 4d358c8e71
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/embedding/browser/gtk/tests/Makefile.in
View File

@@ -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)

24
mozilla/xpcom/glue/nsDebug.h
View File

@@ -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