summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:38:09 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-05-06 13:38:09 -0400
commited25a5005f97b826f9ab00afd3cb9f39889e9283 (patch)
treea479c7dd634e6bd10100b64d15512b3e42cd20b2
parent720074e926ce9bb90e214bf844483fb9a26f8f12 (diff)
downloadenlightenment-ed25a5005f97b826f9ab00afd3cb9f39889e9283.tar.gz
clean up mixer includes
config.h needs to be included. always.
-rw-r--r--src/modules/mixer/lib/backends/pulseaudio/pulse.c10
-rw-r--r--src/modules/mixer/lib/emix.h4
2 files changed, 10 insertions, 4 deletions
diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
index f882734779..8c2cf41533 100644
--- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c
+++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
@@ -1,9 +1,11 @@
-#include <Eina.h>
-#include <Ecore.h>
-#include <pulse/pulseaudio.h>
-
+#include "e.h"
#include "emix.h"
+#include <pulse/pulseaudio.h>
+
+#undef ERR
+#undef DBG
+#undef WRN
#define ERR(...) EINA_LOG_ERR(__VA_ARGS__)
#define DBG(...) EINA_LOG_DBG(__VA_ARGS__)
#define WRN(...) EINA_LOG_WARN(__VA_ARGS__)
diff --git a/src/modules/mixer/lib/emix.h b/src/modules/mixer/lib/emix.h
index 25376fea04..d1772206b3 100644
--- a/src/modules/mixer/lib/emix.h
+++ b/src/modules/mixer/lib/emix.h
@@ -1,6 +1,10 @@
#ifndef EMIX_H
#define EMIX_H
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <Eina.h>
#include <Evas.h>