fix build failure with logging disabled. b=389114 r=shebs sr=roc

widget/src/cocoa/nsChildView.h

@@ -69,12 +69,6 @@
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
-#ifdef MOZ_LOGGING
-// make sure that logging is enabled before including prlog.h
-#define FORCE_PR_LOG
-#include "prlog.h"
-#endif
-
 class gfxASurface;
 class nsChildView;
 union nsPluginPort;

widget/src/cocoa/nsChildView.mm

@@ -78,6 +78,11 @@
 #undef DEBUG_UPDATE
 #undef INVALIDATE_DEBUGGING  // flash areas as they are invalidated
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* sCocoaLog = nsnull;
 #endif
@@ -342,14 +347,13 @@ nsChildView::nsChildView() : nsBaseWidget()
 , mPluginIsCG(PR_FALSE)
 , mVisRgn(nsnull)
 {
-  SetBackgroundColor(NS_RGB(255, 255, 255));
-  SetForegroundColor(NS_RGB(0, 0, 0));
-
 #ifdef PR_LOGGING
   if (!sCocoaLog)
     sCocoaLog = PR_NewLogModule("nsCocoaWidgets");
 #endif
 
+  SetBackgroundColor(NS_RGB(255, 255, 255));
+  SetForegroundColor(NS_RGB(0, 0, 0));
 }
 
 

widget/src/cocoa/nsClipboard.h

@@ -43,16 +43,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#ifdef MOZ_LOGGING
-// make sure that logging is enabled before including prlog.h
-#define FORCE_PR_LOG
-#include "prlog.h"
-#endif
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* sCocoaLog;
-#endif
-
 class nsITransferable;
 
 

widget/src/cocoa/nsClipboard.mm

@@ -46,6 +46,16 @@
 #include "nsIImage.h"
 #include "nsILocalFile.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
+#ifdef PR_LOGGING
+extern PRLogModuleInfo* sCocoaLog;
+#endif
+
+
 nsClipboard::nsClipboard() : nsBaseClipboard()
 {
   mChangeCount = 0;

widget/src/cocoa/nsDragService.h

@@ -43,16 +43,6 @@
 
 #include <Cocoa/Cocoa.h>
 
-#ifdef MOZ_LOGGING
-// make sure that logging is enabled before including prlog.h
-#define FORCE_PR_LOG
-#include "prlog.h"
-#endif
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo* sCocoaLog;
-#endif
-
 extern NSString* const kWildcardPboardType;
 
 class nsDragService : public nsBaseDragService

widget/src/cocoa/nsDragService.mm

@@ -65,6 +65,15 @@
 
 #import <Cocoa/Cocoa.h>
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
+#ifdef PR_LOGGING
+extern PRLogModuleInfo* sCocoaLog;
+#endif
+
 extern NSPasteboard* globalDragPboard;
 extern NSView* globalDragView;
 extern NSEvent* globalDragEvent;