Bug 583727 DOMCI_CASTABLE_INTERFACE: macro redefinition; r=peterv a=jst

dom/base/nsDOMClassInfoID.h

@@ -73,6 +73,7 @@ enum nsDOMClassInfoID {
  *          that implements one of these interfaces must be directly castable
  *          to that interface from the *canonical* nsISupports!
  */
+#undef DOMCI_CASTABLE_INTERFACE
 #define DOMCI_CASTABLE_INTERFACES(_extra)                                     \
 DOMCI_CASTABLE_INTERFACE(nsINode, nsINode, 0, _extra)                         \
 DOMCI_CASTABLE_INTERFACE(nsIContent, nsIContent, 1, _extra)                   \

js/src/xpconnect/src/nsDOMQS.h

@@ -78,6 +78,7 @@ xpc_qsUnwrapArg<_interface>(JSContext *cx,                                    \
 
 #undef DOMCI_CASTABLE_INTERFACE
 
+#undef DOMCI_CASTABLE_INTERFACE
 #define DOMCI_CASTABLE_INTERFACE(_interface, _base, _bit, _extra)             \
   DEFINE_UNWRAP_CAST(_interface, _base, _bit)