aboutsummaryrefslogtreecommitdiff
path: root/src/conf.h
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/conf.h
parent5ef17ac1aa9839208513be67a64fbf78658cf21e (diff)
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 'src/conf.h')
-rw-r--r--src/conf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf.h b/src/conf.h
index 5891eddf..e5875d9b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef CONF_H
-#define CONF_H
+#ifndef MPD_CONF_H
+#define MPD_CONF_H
#define CONF_MUSIC_DIR "music_directory"
#define CONF_PLAYLIST_DIR "playlist_directory"