From d17f9943af8aeeca65b327ad22475b4df36a3b2d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 1 Aug 2008 20:28:58 +0000
Subject: Rename some preprocessor directives from CONFIG_* to HAVE_* where
 appropriate; CONFIG_ prefix for configurable options, HAVE_ for
 system-dependent stuff.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp_msg.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mp_msg.c')

diff --git a/mp_msg.c b/mp_msg.c
index 2f9f32c098..58d1d32caf 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 #include <iconv.h>
 #include <errno.h>
 extern char* get_term_charset(void);
@@ -29,7 +29,7 @@ int mp_msg_level_all = MSGL_STATUS;
 int verbose = 0;
 int mp_msg_color = 0;
 int mp_msg_module = 0;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 char *mp_msg_charset = NULL;
 static char *old_charset = NULL;
 static iconv_t msgiconv;
@@ -37,7 +37,7 @@ static iconv_t msgiconv;
 
 const char* filename_recode(const char* filename)
 {
-#if !defined(CONFIG_ICONV) || !defined(MSG_CHARSET)
+#if !defined(HAVE_ICONV) || !defined(MSG_CHARSET)
     return filename;
 #else
     static iconv_t inv_msgiconv = (iconv_t)(-1);
@@ -73,7 +73,7 @@ void mp_msg_init(void){
         verbose = atoi(env);
     for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2;
     mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
     mp_msg_charset = getenv("MPLAYER_CHARSET");
     if (!mp_msg_charset)
       mp_msg_charset = get_term_charset();
@@ -184,7 +184,7 @@ void mp_msg(int mod, int lev, const char *format, ... ){
         guiMessageBox(lev, tmp);
 #endif
 
-#if defined(CONFIG_ICONV) && defined(MSG_CHARSET)
+#if defined(HAVE_ICONV) && defined(MSG_CHARSET)
     if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) {
       char tmp2[MSGSIZE_MAX];
       size_t inlen = strlen(tmp), outlen = MSGSIZE_MAX;
-- 
cgit v1.2.3