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)
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 f88273477..8c2cf4153 100644
--- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c
+++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
@@ -1,9 +1,11 @@
1#include <Eina.h> 1#include "e.h"
2#include <Ecore.h>
3#include <pulse/pulseaudio.h>
4
5#include "emix.h" 2#include "emix.h"
6 3
4#include <pulse/pulseaudio.h>
5
6#undef ERR
7#undef DBG
8#undef WRN
7#define ERR(...) EINA_LOG_ERR(__VA_ARGS__) 9#define ERR(...) EINA_LOG_ERR(__VA_ARGS__)
8#define DBG(...) EINA_LOG_DBG(__VA_ARGS__) 10#define DBG(...) EINA_LOG_DBG(__VA_ARGS__)
9#define WRN(...) EINA_LOG_WARN(__VA_ARGS__) 11#define WRN(...) EINA_LOG_WARN(__VA_ARGS__)
diff --git a/src/modules/mixer/lib/emix.h b/src/modules/mixer/lib/emix.h
index 25376fea0..d1772206b 100644
--- a/src/modules/mixer/lib/emix.h
+++ b/src/modules/mixer/lib/emix.h
@@ -1,6 +1,10 @@
1#ifndef EMIX_H 1#ifndef EMIX_H
2#define EMIX_H 2#define EMIX_H
3 3
4#ifdef HAVE_CONFIG_H
5# include "config.h"
6#endif
7
4#include <Eina.h> 8#include <Eina.h>
5#include <Evas.h> 9#include <Evas.h>
6 10