diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-01 20:28:58 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-01 20:28:58 +0000 |
| commit | d17f9943af8aeeca65b327ad22475b4df36a3b2d (patch) | |
| tree | 2e92c593409a4e3222d2524460178cf133af8f86 /osdep | |
| parent | 95c0b67d60690dfca422eab3d28bdac9a3e46921 (diff) | |
| download | mpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.bz2 mpv-d17f9943af8aeeca65b327ad22475b4df36a3b2d.tar.xz | |
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
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/getch2-os2.c | 6 | ||||
| -rw-r--r-- | osdep/getch2-win.c | 2 | ||||
| -rw-r--r-- | osdep/getch2.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c index 5f541e9ec8..a89d65f8de 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(CONFIG_LANGINFO) && defined(CONFIG_ICONV) +#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV) #include <locale.h> #include <langinfo.h> #endif @@ -182,12 +182,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 83d502f7c7..d956b6fa5b 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -142,7 +142,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 abdd482d9c..2d7fe8a14b 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 @@ -56,7 +56,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> @@ -270,11 +270,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"); |