From 17ae59067df4e73160b30da81ce72e491cb86998 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 9 Jan 2014 13:01:43 -0800
Subject: [PATCH] Bug 958203: Move logging macros from OpenFileFinder.h to its
 .cpp file, to fix 'redefined' build warnings in AutoMounter.cpp. r=dhylands

---
 dom/system/gonk/OpenFileFinder.cpp | 13 +++++++++++++
 dom/system/gonk/OpenFileFinder.h   | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dom/system/gonk/OpenFileFinder.cpp b/dom/system/gonk/OpenFileFinder.cpp
index e45a75d932f6..baad77806878 100644
--- a/dom/system/gonk/OpenFileFinder.cpp
+++ b/dom/system/gonk/OpenFileFinder.cpp
@@ -10,6 +10,19 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#define USE_DEBUG 0
+
+#undef LOG
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO,  "OpenFileFinder", ## args)
+#define LOGW(args...) __android_log_print(ANDROID_LOG_WARN,  "OpenFileFinder", ## args)
+#define ERR(args...)  __android_log_print(ANDROID_LOG_ERROR, "OpenFileFinder", ## args)
+
+#if USE_DEBUG
+#define DBG(args...)  __android_log_print(ANDROID_LOG_DEBUG, "OpenFileFinder" , ## args)
+#else
+#define DBG(args...)
+#endif
+
 namespace mozilla {
 namespace system {
 
diff --git a/dom/system/gonk/OpenFileFinder.h b/dom/system/gonk/OpenFileFinder.h
index e4f5f12f1c1f..24517965a592 100644
--- a/dom/system/gonk/OpenFileFinder.h
+++ b/dom/system/gonk/OpenFileFinder.h
@@ -9,19 +9,6 @@
 
 #include <dirent.h>
 
-#define USE_DEBUG 0
-
-#undef LOG
-#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO,  "OpenFileFinder", ## args)
-#define LOGW(args...) __android_log_print(ANDROID_LOG_WARN,  "OpenFileFinder", ## args)
-#define ERR(args...)  __android_log_print(ANDROID_LOG_ERROR, "OpenFileFinder", ## args)
-
-#if USE_DEBUG
-#define DBG(args...)  __android_log_print(ANDROID_LOG_DEBUG, "OpenFileFinder" , ## args)
-#else
-#define DBG(args...)
-#endif
-
 namespace mozilla {
 namespace system {