[MPlayer-cvslog] r38327 - in trunk/stream: stream.c stream.h stream_dvd.c

[reimar]

Author: reimar
Date: Sat Nov 27 13:59:02 2021
New Revision: 38327

Log:
stream: disable Windows wide char code for cygwin.

It does not compile as cygwin does not have
WideCharToMultiByte or at least some necessary includes
are missing  and it probably makes no sense to use it
as cygwin should hide these things (stream_file.c is
also mingw-only).

Modified:
   trunk/stream/stream.c
   trunk/stream/stream.h
   trunk/stream/stream_dvd.c

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	Sun Nov  7 01:46:52 2021	(r38326)
+++ trunk/stream/stream.c	Sat Nov 27 13:59:02 2021	(r38327)
@@ -749,7 +749,7 @@ int parse_chapter_range(const m_option_t
   return 0;
 }
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef __MINGW32__
 wchar_t *utf8_to_wide_char(const char *utf8)
 {
     int conv_size;

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Sun Nov  7 01:46:52 2021	(r38326)
+++ trunk/stream/stream.h	Sat Nov 27 13:59:02 2021	(r38327)
@@ -406,7 +406,7 @@ int bluray_id_from_lang(stream_t *s, enu
 
 int parse_chapter_range(const m_option_t *conf, const char *range);
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef __MINGW32__
 wchar_t *utf8_to_wide_char(const char *utf8);
 char *utf8_to_local_windows_code_page(const char *utf8);
 #endif

Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c	Sun Nov  7 01:46:52 2021	(r38326)
+++ trunk/stream/stream_dvd.c	Sat Nov 27 13:59:02 2021	(r38327)
@@ -790,7 +790,7 @@ static int open_s(stream_t *stream,int m
     } else
 #endif /* defined(__APPLE__) || defined(__DARWIN__) */
     {
-#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef __MINGW32__
         char *ansi_dvd_device_current = utf8_to_local_windows_code_page(dvd_device_current);
 
         dvd = DVDOpen(ansi_dvd_device_current ? ansi_dvd_device_current : dvd_device_current);