aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder
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/decoder
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/decoder/_flac_common.h4
-rw-r--r--src/decoder/_ogg_common.h4
-rw-r--r--src/decoder_api.h4
-rw-r--r--src/decoder_control.h4
-rw-r--r--src/decoder_internal.h4
-rw-r--r--src/decoder_list.h4
-rw-r--r--src/decoder_thread.h4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/decoder/_flac_common.h b/src/decoder/_flac_common.h
index 052074980..c1c648a62 100644
--- a/src/decoder/_flac_common.h
+++ b/src/decoder/_flac_common.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _FLAC_COMMON_H
-#define _FLAC_COMMON_H
+#ifndef MPD_FLAC_COMMON_H
+#define MPD_FLAC_COMMON_H
#include "../decoder_api.h"
diff --git a/src/decoder/_ogg_common.h b/src/decoder/_ogg_common.h
index d03bae301..efc71c56e 100644
--- a/src/decoder/_ogg_common.h
+++ b/src/decoder/_ogg_common.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _OGG_COMMON_H
-#define _OGG_COMMON_H
+#ifndef MPD_OGG_COMMON_H
+#define MPD_OGG_COMMON_H
#include "../decoder_api.h"
diff --git a/src/decoder_api.h b/src/decoder_api.h
index 808eb979e..a48718846 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_API_H
-#define DECODER_API_H
+#ifndef MPD_DECODER_API_H
+#define MPD_DECODER_API_H
/*
* This is the public API which is used by decoder plugins to
diff --git a/src/decoder_control.h b/src/decoder_control.h
index d03d28a46..bfee8a259 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODE_H
-#define DECODE_H
+#ifndef MPD_DECODER_CONTROL_H
+#define MPD_DECODER_CONTROL_H
#include "decoder_api.h"
diff --git a/src/decoder_internal.h b/src/decoder_internal.h
index ee8f23b8b..45c104651 100644
--- a/src/decoder_internal.h
+++ b/src/decoder_internal.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_INTERNAL_H
-#define DECODER_INTERNAL_H
+#ifndef MPD_DECODER_INTERNAL_H
+#define MPD_DECODER_INTERNAL_H
#include "decoder_api.h"
#include "pcm_utils.h"
diff --git a/src/decoder_list.h b/src/decoder_list.h
index b17e5caab..ea3eb7f92 100644
--- a/src/decoder_list.h
+++ b/src/decoder_list.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INPUT_PLUGIN_H
-#define INPUT_PLUGIN_H
+#ifndef MPD_DECODER_LIST_H
+#define MPD_DECODER_LIST_H
#include <stdio.h>
diff --git a/src/decoder_thread.h b/src/decoder_thread.h
index 27ca8a9b2..7dd4b4bfd 100644
--- a/src/decoder_thread.h
+++ b/src/decoder_thread.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_THREAD_H
-#define DECODER_THREAD_H
+#ifndef MPD_DECODER_THREAD_H
+#define MPD_DECODER_THREAD_H
void decoder_thread_start(void);