aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-31 09:19:53 +0100
committerMax Kellermann <max@duempel.org>2008-10-31 09:19:53 +0100
commitea515494cb23160c2eb05835411b8927a025026f (patch)
tree8b776099c50bc1b41b5a986eb9811e621e40e81c /src/output
parent5ef17ac1aa9839208513be67a64fbf78658cf21e (diff)
downloadmpd-ea515494cb23160c2eb05835411b8927a025026f.tar.gz
mpd-ea515494cb23160c2eb05835411b8927a025026f.tar.xz
mpd-ea515494cb23160c2eb05835411b8927a025026f.zip
added prefix to header macros
"LOG_H" is a macro which is also used by ffmpeg/log.h. This is ffmpeg's fault, because short macros should be reserved for applications, but since it's always a good idea to choose prefixed macro names, even for applications, we are going to do that in MPD.
Diffstat (limited to '')
-rw-r--r--src/output/shout_plugin.h4
-rw-r--r--src/outputBuffer.h4
-rw-r--r--src/output_api.h4
-rw-r--r--src/output_control.h4
-rw-r--r--src/output_internal.h4
-rw-r--r--src/output_list.h4
-rw-r--r--src/output_thread.h4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/output/shout_plugin.h b/src/output/shout_plugin.h
index 2ddde22ae..aa084d988 100644
--- a/src/output/shout_plugin.h
+++ b/src/output/shout_plugin.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef AUDIO_OUTPUT_SHOUT_H
-#define AUDIO_OUTPUT_SHOUT_H
+#ifndef MPD_SHOUT_PLUGIN_H
+#define MPD_SHOUT_PLUGIN_H
#include "../output_api.h"
#include "../conf.h"
diff --git a/src/outputBuffer.h b/src/outputBuffer.h
index 53c3893c9..4769abc19 100644
--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_BUFFER_H
-#define OUTPUT_BUFFER_H
+#ifndef MPD_OUTPUT_BUFFER_H
+#define MPD_OUTPUT_BUFFER_H
#include "audio_format.h"
diff --git a/src/output_api.h b/src/output_api.h
index fb0844cd8..9d4df7f37 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_API_H
-#define OUTPUT_API_H
+#ifndef MPD_OUTPUT_API_H
+#define MPD_OUTPUT_API_H
#include "../config.h"
#include "audio_format.h"
diff --git a/src/output_control.h b/src/output_control.h
index 62e88eb0f..899c763ae 100644
--- a/src/output_control.h
+++ b/src/output_control.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_CONTROL_H
-#define OUTPUT_CONTROL_H
+#ifndef MPD_OUTPUT_CONTROL_H
+#define MPD_OUTPUT_CONTROL_H
#include "conf.h"
diff --git a/src/output_internal.h b/src/output_internal.h
index 97b242551..cea1455e3 100644
--- a/src/output_internal.h
+++ b/src/output_internal.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_INTERNAL_H
-#define OUTPUT_INTERNAL_H
+#ifndef MPD_OUTPUT_INTERNAL_H
+#define MPD_OUTPUT_INTERNAL_H
#include "pcm_utils.h"
#include "notify.h"
diff --git a/src/output_list.h b/src/output_list.h
index 1be0b8169..9836c83e6 100644
--- a/src/output_list.h
+++ b/src/output_list.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_LIST_H
-#define OUTPUT_LIST_H
+#ifndef MPD_OUTPUT_LIST_H
+#define MPD_OUTPUT_LIST_H
extern const struct audio_output_plugin *audio_output_plugins[];
diff --git a/src/output_thread.h b/src/output_thread.h
index 2b2f1fb3d..1b196123d 100644
--- a/src/output_thread.h
+++ b/src/output_thread.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_THREAD_H
-#define OUTPUT_THREAD_H
+#ifndef MPD_OUTPUT_THREAD_H
+#define MPD_OUTPUT_THREAD_H
struct audio_output;