nsnull version of wrapping macros. b=417563 sr=roc
authorjoshmoz@gmail.com
Tue, 19 Feb 2008 18:23:52 -0800
changeset 11898 6fb0e3389728399fb165642d95cf90bad6b39134
parent 11897 774bc453897fa9b473780594084a46702f8061d1
child 11899 e649baab110af4aa6af7bd3a7a30c9a88c5a7da4
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs417563
milestone1.9b4pre
nsnull version of wrapping macros. b=417563 sr=roc
xpcom/base/nsObjCExceptions.h
--- a/xpcom/base/nsObjCExceptions.h
+++ b/xpcom/base/nsObjCExceptions.h
@@ -123,16 +123,22 @@ NS_OBJC_TRY(_e, )
 // to get scoping right when wrapping an entire method.
 
 #define NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL @try {
 #define NS_OBJC_END_TRY_ABORT_BLOCK_NIL   } @catch(NSException *_exn) {        \
                                             nsObjCExceptionLogAbort(_exn);     \
                                           }                                    \
                                           return nil;
 
+#define NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSNULL @try {
+#define NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL   } @catch(NSException *_exn) {     \
+                                               nsObjCExceptionLogAbort(_exn);  \
+                                             }                                 \
+                                             return nsnull;
+
 #define NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT @try {
 #define NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT   } @catch(NSException *_exn) {   \
                                                  nsObjCExceptionLogAbort(_exn);\
                                                }                               \
                                                return NS_ERROR_FAILURE;
 
 #define NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN    @try {
 #define NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(_rv) } @catch(NSException *_exn) {   \