summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 10:36:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 10:36:07 +0000
commit091d352d065442817aa05c2f61910366004405be (patch)
tree9f9101aac327a41f88a3828a19cf6f2e5f4d4fc9 /osdep
parentdba246199c20857d29a08bf176003b58736da31c (diff)
downloadmpv-091d352d065442817aa05c2f61910366004405be.tar.bz2
mpv-091d352d065442817aa05c2f61910366004405be.tar.xz
Rename font-related preprocessor directives.
Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/getch2-os2.c4
-rw-r--r--osdep/getch2-win.c2
-rw-r--r--osdep/getch2.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c
index a89d65f8de..ef2dcf22a6 100644
--- a/osdep/getch2-os2.c
+++ b/osdep/getch2-os2.c
@@ -32,7 +32,7 @@
#include "input/input.h"
#include "mp_fifo.h"
-#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV)
+#if defined(HAVE_LANGINFO) && defined(CONFIG_ICONV)
#include <locale.h>
#include <langinfo.h>
#endif
@@ -182,7 +182,7 @@ void getch2_disable( void )
getch2_status = 0;
}
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
char *get_term_charset( void )
{
char *charset = NULL;
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index d956b6fa5b..83d502f7c7 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -142,7 +142,7 @@ void getch2_disable(){
getch2_status=0;
}
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
static const struct {
unsigned cp;
char* alias;
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 2d7fe8a14b..b697bd8bc7 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -28,7 +28,7 @@
#endif
#endif
-#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV)
+#if defined(HAVE_LANGINFO) && defined(CONFIG_ICONV)
#include <locale.h>
#include <langinfo.h>
#endif
@@ -270,7 +270,7 @@ void getch2_disable(void){
getch2_status=0;
}
-#ifdef HAVE_ICONV
+#ifdef CONFIG_ICONV
char* get_term_charset(void)
{
char* charset = NULL;