Static build bustage fix

content/base/src/nsDocumentViewer.cpp

@@ -133,8 +133,8 @@
 static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 // PrintOptions is now implemented by PrintSettingsService
-const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
-const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
+static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
 
 // Printing Events
 #include "nsIEventQueue.h"
@@ -8236,7 +8236,6 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
   NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
 
   nsresult rv = NS_ERROR_FAILURE;
-  //nsCOMPtr<nsIPrintOptions> printSettingsService = do_GetService(kPrintOptionsCID, &rv);
   nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);

embedding/components/printingui/src/os2/nsPrintingPromptService.cpp

@@ -55,7 +55,7 @@
 #include "nsIPrintOptions.h"
 #include "nsIServiceManager.h"
 #include "nsGfxCIID.h"
-const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
 
 static const char *kPrintDialogURL         = "chrome://global/content/printdialog.xul";
 static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul";

gfx/src/nsPrintOptionsImpl.cpp

@@ -1172,7 +1172,7 @@ public:
 };
 Tester::Tester()
 {
-  const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+  static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
   nsCOMPtr<nsIPrintSettings> ps;
   nsresult rv;
   nsCOMPtr<nsIPrintOptions> printService = do_GetService(kPrintOptionsCID, &rv);

layout/base/nsDocumentViewer.cpp

@@ -133,8 +133,8 @@
 static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 // PrintOptions is now implemented by PrintSettingsService
-const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
-const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
+static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
 
 // Printing Events
 #include "nsIEventQueue.h"
@@ -8236,7 +8236,6 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
   NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
 
   nsresult rv = NS_ERROR_FAILURE;
-  //nsCOMPtr<nsIPrintOptions> printSettingsService = do_GetService(kPrintOptionsCID, &rv);
   nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);

layout/generic/nsSimplePageSequence.cpp

@@ -80,7 +80,8 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 #include "nsIPrintOptions.h"
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
-const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+
+static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
 
 //
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);

layout/html/base/src/nsSimplePageSequence.cpp

@@ -80,7 +80,8 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 #include "nsIPrintOptions.h"
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
-const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+
+static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
 
 //
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);