From a6af8ecfd1b4ad8d177e956cbb1e313eceb6cbb6 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Sat, 16 Oct 2010 04:42:34 +0000
Subject: [PATCH] combine private headers

SVN revision: 53481
---
 legacy/eeze/src/lib/eeze_main.c         |  1 -
 legacy/eeze/src/lib/eeze_private.h      | 25 -------------------------
 legacy/eeze/src/lib/eeze_udev_find.c    |  1 -
 legacy/eeze/src/lib/eeze_udev_private.c |  1 -
 legacy/eeze/src/lib/eeze_udev_private.h | 22 ++++++++++++++++++++++
 legacy/eeze/src/lib/eeze_udev_syspath.c |  1 -
 legacy/eeze/src/lib/eeze_udev_walk.c    |  1 -
 legacy/eeze/src/lib/eeze_udev_watch.c   |  3 +--
 8 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 legacy/eeze/src/lib/eeze_private.h

diff --git a/legacy/eeze/src/lib/eeze_main.c b/legacy/eeze/src/lib/eeze_main.c
index 755d9dccd9..3490711246 100644
--- a/legacy/eeze/src/lib/eeze_main.c
+++ b/legacy/eeze/src/lib/eeze_main.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <Eeze.h>
-#include "eeze_private.h"
 #include "eeze_udev_private.h"
 
 /**
diff --git a/legacy/eeze/src/lib/eeze_private.h b/legacy/eeze/src/lib/eeze_private.h
deleted file mode 100644
index a540c41687..0000000000
--- a/legacy/eeze/src/lib/eeze_private.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef EEZE_PRIVATE_H
-#define EEZE_PRIVATE_H
-#ifndef EEZE_COLOR_DEFAULT
-#define EEZE_COLOR_DEFAULT EINA_COLOR_CYAN
-#endif
-extern int _eeze_udev_log_dom;
-#ifdef ERR
-#undef ERR
-#endif
-#ifdef INF
-#undef INF
-#endif
-#ifdef WARN
-#undef WARN
-#endif
-#ifdef DBG
-#undef DBG
-#endif
-
-#define DBG(...)   EINA_LOG_DOM_DBG(_eeze_udev_log_dom, __VA_ARGS__)
-#define INFO(...)    EINA_LOG_DOM_INFO(_eeze_udev_log_dom, __VA_ARGS__)
-#define WARN(...) EINA_LOG_DOM_WARN(_eeze_udev_log_dom, __VA_ARGS__)
-#define ERR(...)   EINA_LOG_DOM_ERR(_eeze_udev_log_dom, __VA_ARGS__)
-
-#endif
diff --git a/legacy/eeze/src/lib/eeze_udev_find.c b/legacy/eeze/src/lib/eeze_udev_find.c
index ebce6fa02c..3d2b4c9f48 100644
--- a/legacy/eeze/src/lib/eeze_udev_find.c
+++ b/legacy/eeze/src/lib/eeze_udev_find.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <Eeze.h>
-#include "eeze_private.h"
 #include "eeze_udev_private.h"
 
 extern _udev *udev;
diff --git a/legacy/eeze/src/lib/eeze_udev_private.c b/legacy/eeze/src/lib/eeze_udev_private.c
index 68a21f1915..1de1eb2fb5 100644
--- a/legacy/eeze/src/lib/eeze_udev_private.c
+++ b/legacy/eeze/src/lib/eeze_udev_private.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <Eeze.h>
-#include "eeze_private.h"
 #include "eeze_udev_private.h"
 
 extern _udev *udev;
diff --git a/legacy/eeze/src/lib/eeze_udev_private.h b/legacy/eeze/src/lib/eeze_udev_private.h
index 17212e0e09..6b2e2b9160 100644
--- a/legacy/eeze/src/lib/eeze_udev_private.h
+++ b/legacy/eeze/src/lib/eeze_udev_private.h
@@ -2,6 +2,28 @@
 #define EEZE_UDEV_PRIVATE_H
 #include "Eeze.h"
 
+#ifndef EEZE_COLOR_DEFAULT
+#define EEZE_COLOR_DEFAULT EINA_COLOR_CYAN
+#endif
+extern int _eeze_udev_log_dom;
+#ifdef ERR
+#undef ERR
+#endif
+#ifdef INF
+#undef INF
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef DBG
+#undef DBG
+#endif
+
+#define DBG(...)   EINA_LOG_DOM_DBG(_eeze_udev_log_dom, __VA_ARGS__)
+#define INFO(...)    EINA_LOG_DOM_INFO(_eeze_udev_log_dom, __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(_eeze_udev_log_dom, __VA_ARGS__)
+#define ERR(...)   EINA_LOG_DOM_ERR(_eeze_udev_log_dom, __VA_ARGS__)
+
 /* typedefs because I'm lazy */
 typedef struct udev _udev;
 typedef struct udev_list_entry _udev_list_entry;
diff --git a/legacy/eeze/src/lib/eeze_udev_syspath.c b/legacy/eeze/src/lib/eeze_udev_syspath.c
index cc3e8ecfa2..fa744ed225 100644
--- a/legacy/eeze/src/lib/eeze_udev_syspath.c
+++ b/legacy/eeze/src/lib/eeze_udev_syspath.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <Eeze.h>
-#include "eeze_private.h"
 #include "eeze_udev_private.h"
 
 extern _udev *udev;
diff --git a/legacy/eeze/src/lib/eeze_udev_walk.c b/legacy/eeze/src/lib/eeze_udev_walk.c
index 2d970fa305..df5891d2e2 100644
--- a/legacy/eeze/src/lib/eeze_udev_walk.c
+++ b/legacy/eeze/src/lib/eeze_udev_walk.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <Eeze.h>
-#include "eeze_private.h"
 #include "eeze_udev_private.h"
 
 extern _udev *udev;
diff --git a/legacy/eeze/src/lib/eeze_udev_watch.c b/legacy/eeze/src/lib/eeze_udev_watch.c
index c7360e705e..f5b2e6398a 100644
--- a/legacy/eeze/src/lib/eeze_udev_watch.c
+++ b/legacy/eeze/src/lib/eeze_udev_watch.c
@@ -2,9 +2,8 @@
 #include "config.h"
 #endif
 
-#include <Eeze.h>
 #include <Ecore.h>
-#include "eeze_private.h"
+#include <Eeze.h>
 #include "eeze_udev_private.h"
 
 extern _udev *udev;