diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 10:22:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 10:22:11 -0300 |
| commit | f87ad3a058bfee786e942106c5c3450c02a66d48 (patch) | |
| tree | ffba88e386e67353bbcecf0f3050439052fd1a8f /libavutil | |
| parent | 7e76e1ea80052ee95ef33d5341b9251b90766c9c (diff) | |
| parent | e41daa62465036ad36ad0bd14e4936e848d7f07e (diff) | |
| download | ffmpeg-f87ad3a058bfee786e942106c5c3450c02a66d48.tar.gz | |
Merge commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e'
* commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e':
Remove support for building for mingw32ce (Windows CE)
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/file_open.c | 2 | ||||
| -rw-r--r-- | libavutil/log.c | 6 | ||||
| -rw-r--r-- | libavutil/wchar_filename.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 258bb3074e..a8da283583 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -29,7 +29,7 @@ #include <io.h> #endif -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 #undef open #undef lseek #undef stat diff --git a/libavutil/log.c b/libavutil/log.c index be806202ff..7a6dd936e5 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -57,7 +57,7 @@ static int av_log_level = AV_LOG_INFO; static int flags; #define NB_LEVELS 8 -#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE +#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE #include <windows.h> static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = { [AV_LOG_PANIC /8] = 12, @@ -124,7 +124,7 @@ static int use_color = -1; static void check_color_terminal(void) { -#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE +#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE CONSOLE_SCREEN_BUFFER_INFO con_info; con = GetStdHandle(STD_ERROR_HANDLE); use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && @@ -159,7 +159,7 @@ static void colored_fputs(int level, int tint, const char *str) if (level == AV_LOG_INFO/8) local_use_color = 0; else local_use_color = use_color; -#if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE +#if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE if (local_use_color) SetConsoleTextAttribute(con, background | color[level]); fputs(str, stderr); diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 2ade321bed..142d50e7c3 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -19,7 +19,7 @@ #ifndef AVUTIL_WCHAR_FILENAME_H #define AVUTIL_WCHAR_FILENAME_H -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 #include <windows.h> #include "mem.h" |