Start unifying names of internal preprocessor directives.

Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 12 insertions, 12 deletions

diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c
index 41e498d20d..5f541e9ec8 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( USE_LANGINFO ) && defined( USE_ICONV )
+#if defined(CONFIG_LANGINFO) && defined(CONFIG_ICONV)
 #include <locale.h>
 #include <langinfo.h>
 #endif
@@ -182,12 +182,12 @@ void getch2_disable( void )
     getch2_status = 0;
 }
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
 char *get_term_charset( void )
 {
     char *charset = NULL;
 
-#ifdef USE_LANGINFO
+#ifdef CONFIG_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 940fb5a03f..83d502f7c7 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -142,7 +142,7 @@ void getch2_disable(){
     getch2_status=0;
 }
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
 static const struct {
     unsigned cp;
     char* alias;
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 4a571033b1..abdd482d9c 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -2,9 +2,9 @@
 
 #include "config.h"
 
-//#define USE_TERMCAP
+//#define CONFIG_TERMCAP
 #if !defined(__OS2__) && !defined(__MORPHOS__)
-#define USE_IOCTL
+#define CONFIG_IOCTL
 #endif
 
 #define MAX_KEYS 64
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#ifdef USE_IOCTL
+#ifdef CONFIG_IOCTL
 #include <sys/ioctl.h>
 #endif
 
@@ -28,7 +28,7 @@
 #endif
 #endif
 
-#if defined(USE_LANGINFO) && defined(USE_ICONV)
+#if defined(CONFIG_LANGINFO) && defined(CONFIG_ICONV)
 #include <locale.h>
 #include <langinfo.h>
 #endif
@@ -56,7 +56,7 @@ typedef struct {
 static keycode_st getch2_keys[MAX_KEYS];
 static int getch2_key_db=0;
 
-#ifdef USE_TERMCAP
+#ifdef CONFIG_TERMCAP
 
 #if 0
 #include <termcap.h>
@@ -125,7 +125,7 @@ int load_termcap(char *termtype){
 #endif
 
 void get_screen_size(void){
-#ifdef USE_IOCTL
+#ifdef CONFIG_IOCTL
   struct winsize ws;
   if (ioctl(0, TIOCGWINSZ, &ws) < 0 || !ws.ws_row || !ws.ws_col) return;
 /*  printf("Using IOCTL\n"); */
@@ -270,11 +270,11 @@ void getch2_disable(void){
     getch2_status=0;
 }
 
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
 char* get_term_charset(void)
 {
     char* charset = NULL;
-#ifdef USE_LANGINFO
+#ifdef CONFIG_LANGINFO
     setlocale(LC_CTYPE, "");
     charset = nl_langinfo(CODESET);
     setlocale(LC_CTYPE, "C");