From 115050ca7d2d138c1aa38bbafba4ef2ad07af567 Mon Sep 17 00:00:00 2001
From: "sh.pi" <sh.pi@samsung.com>
Date: Wed, 3 Apr 2013 16:38:56 +0900
Subject: [PATCH] remove including 'util.h' in core.h

there is conflict with definition of dlog.
then util.h is removed in core.h

Change-Id: Id3b49a4ad97a0bbce8c0cea6a8a6807502b2cb0b
Signed-off-by: Krzysztof Sasiak <k.sasiak@samsung.com>
---
 display/battery.c     | 1 +
 display/conf.c        | 1 +
 display/core.c        | 1 +
 display/core.h        | 1 -
 display/key-filter.c  | 1 +
 display/llinterface.c | 1 +
 display/lsensor.c     | 1 +
 display/poll.c        | 1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/display/battery.c b/display/battery.c
index 3d93c23..d265db5 100644
--- a/display/battery.c
+++ b/display/battery.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "util.h"
 #include "core.h"
 #include "battery.h"
 
diff --git a/display/conf.c b/display/conf.c
index dc1ebee..070ecf3 100644
--- a/display/conf.c
+++ b/display/conf.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "util.h"
 #include "conf.h"
 
 enum {
diff --git a/display/core.c b/display/core.c
index 0bccc5e..da2b79a 100644
--- a/display/core.c
+++ b/display/core.c
@@ -39,6 +39,7 @@
 #include <vconf-keys.h>
 #include <Ecore.h>
 
+#include "util.h"
 #include "core.h"
 #include "battery.h"
 #include "device-node.h"
diff --git a/display/core.h b/display/core.h
index 0995cfe..7488bc9 100644
--- a/display/core.h
+++ b/display/core.h
@@ -23,7 +23,6 @@
 #ifndef __POWER_MANAGER_H__
 #define __POWER_MANAGER_H__
 
-#include "util.h"
 #include "poll.h"
 #include "llinterface.h"
 #include "setting.h"
diff --git a/display/key-filter.c b/display/key-filter.c
index bbdf44f..240bc17 100644
--- a/display/key-filter.c
+++ b/display/key-filter.c
@@ -24,6 +24,7 @@
 #include <vconf.h>
 #include <Ecore.h>
 
+#include "util.h"
 #include "core.h"
 #include "poll.h"
 #include "core/queue.h"
diff --git a/display/llinterface.c b/display/llinterface.c
index 948267f..dabc4fb 100644
--- a/display/llinterface.c
+++ b/display/llinterface.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include "util.h"
 #include "llinterface.h"
 #include "conf.h"
 #include "vconf.h"
diff --git a/display/lsensor.c b/display/lsensor.c
index bf5263c..5206c2c 100644
--- a/display/lsensor.c
+++ b/display/lsensor.c
@@ -27,6 +27,7 @@
 #include <sensor.h>
 #include <Ecore.h>
 
+#include "util.h"
 #include "core.h"
 #include "device-node.h"
 
diff --git a/display/poll.c b/display/poll.c
index 009fb4a..91a2f17 100644
--- a/display/poll.c
+++ b/display/poll.c
@@ -40,6 +40,7 @@
 #include <sys/un.h>
 #include <Ecore.h>
 
+#include "util.h"
 #include "core.h"
 #include "poll.h"
 
-- 
2.7.4