From ea515494cb23160c2eb05835411b8927a025026f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 31 Oct 2008 09:19:53 +0100
Subject: 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.
---
 src/conf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/conf.h')

diff --git a/src/conf.h b/src/conf.h
index 5891eddf9..e5875d9b7 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"
-- 
cgit v1.2.3