3 files changed, 9 insertions, 9 deletions
diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c
index 5d21efbcd0..3b94b4d736 100644
--- a/osdep/getch2-os2.c
+++ b/osdep/getch2-os2.c
@@ -33,7 +33,7 @@
 #include "mp_fifo.h"
 #include "getch2.h"
 
-#if defined(CONFIG_LANGINFO) && defined(CONFIG_ICONV)
+#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV)
 #include <locale.h>
 #include <langinfo.h>
 #endif
@@ -183,12 +183,12 @@ void getch2_disable( void )
     getch2_status = 0;
 }
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 char *get_term_charset( void )
 {
     char *charset = NULL;
 
-#ifdef CONFIG_LANGINFO
+#ifdef HAVE_LANGINFO
     setlocale( LC_CTYPE, "");
     charset = nl_langinfo( CODESET );
     setlocale( LC_CTYPE, "C");
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 49ec9c46b3..feaf5f74d9 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -144,7 +144,7 @@ void getch2_disable(){
     getch2_status=0;
 }
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 static const struct {
     unsigned cp;
     char* alias;
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 92ac4a844d..c9cb4f6319 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -2,7 +2,7 @@
 
 #include "config.h"
 
-//#define CONFIG_TERMCAP
+//#define HAVE_TERMCAP
 #if !defined(__OS2__) && !defined(__MORPHOS__)
 #define CONFIG_IOCTL
 #endif
@@ -28,7 +28,7 @@
 #endif
 #endif
 
-#if defined(CONFIG_LANGINFO) && defined(CONFIG_ICONV)
+#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV)
 #include <locale.h>
 #include <langinfo.h>
 #endif
@@ -57,7 +57,7 @@ typedef struct {
 static keycode_st getch2_keys[MAX_KEYS];
 static int getch2_key_db=0;
 
-#ifdef CONFIG_TERMCAP
+#ifdef HAVE_TERMCAP
 
 #if 0
 #include <termcap.h>
@@ -271,11 +271,11 @@ void getch2_disable(void){
     getch2_status=0;
 }
 
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
 char* get_term_charset(void)
 {
     char* charset = NULL;
-#ifdef CONFIG_LANGINFO
+#ifdef HAVE_LANGINFO
     setlocale(LC_CTYPE, "");
     charset = nl_langinfo(CODESET);
     setlocale(LC_CTYPE, "C");