Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to NS_DECLARE, and make a NS_DEFINE_ macro that's outside the class declaration, r=shaver

widget/public/nsIDeviceContextSpec.h

@@ -47,7 +47,10 @@
 class nsIDeviceContextSpec : public nsISupports
 {
 public:
-   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
+   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContextSpec,
+                              NS_IDEVICE_CONTEXT_SPEC_IID)
+
 #endif

widget/public/nsIDeviceContextSpecFactory.h

@@ -51,7 +51,7 @@ class nsIPrintSettings;
 class nsIDeviceContextSpecFactory : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID)
   /**
    * Initialize the device context spec factory
    * @return error status
@@ -76,4 +76,7 @@ public:
                                      PRBool aIsPrintPreview) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContextSpecFactory,
+                              NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID)
+
 #endif