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

diff --git a/libass/ass.c b/libass/ass.c
index 659f08c4e3d8063d2ee071d91217823527962289..3f78afa9944c870fee9a2ef601c20d2931c9a14f 100644 (file)
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
 
@@ -810,7 +810,7 @@ void ass_process_chunk(ass_track_t* track, char *data, int size, long long timec
        free(str);
 }
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 /** \brief recode buffer to utf-8
  * constraint: codepage != 0
  * \param data pointer to text buffer
@@ -991,7 +991,7 @@ ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize,
        if (!buf)
                return 0;
        
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
        if (codepage)
                buf = sub_recode(buf, bufsize, codepage);
        if (!buf)
@@ -1017,7 +1017,7 @@ char* read_file_recode(char* fname, char* codepage, int* size)
        buf = read_file(fname, &bufsize);
        if (!buf)
                return 0;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
        if (codepage) {
                 char* tmpbuf = sub_recode(buf, bufsize, codepage);
                 free(buf);
@@ -1071,7 +1071,7 @@ int ass_read_styles(ass_track_t* track, char* fname, char* codepage)
        buf = read_file(fname, &sz);
        if (!buf)
                return 1;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
        if (codepage) {
                char* tmpbuf;
                tmpbuf = sub_recode(buf, sz, codepage);

diff --git a/libass/ass_mp.c b/libass/ass_mp.c
index 063580e0e5d92be91a1e7464e003a13b49422358..2e56a93518dcc9e0ed9eb24172366d28f6fe7611 100644 (file)
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -65,7 +65,7 @@ extern char* sub_font_name;
 extern float text_font_scale_factor;
 extern int subtitle_autoscale;
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 extern char* sub_cp;
 #else
 static char* sub_cp = 0;