Commit dedc5a17 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

MKV: compilation with EGCS is not supported anymore

parent 9b267f52
...@@ -715,11 +715,7 @@ bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t ...@@ -715,11 +715,7 @@ bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t
msg_Dbg( &sys.demuxer, "command : %s", sz_command.c_str() ); msg_Dbg( &sys.demuxer, "command : %s", sz_command.c_str() );
#if defined(__GNUC__) && (__GNUC__ < 3)
if ( sz_command.compare( CMD_MS_GOTO_AND_PLAY, 0, CMD_MS_GOTO_AND_PLAY.size() ) == 0 )
#else
if ( sz_command.compare( 0, CMD_MS_GOTO_AND_PLAY.size(), CMD_MS_GOTO_AND_PLAY ) == 0 ) if ( sz_command.compare( 0, CMD_MS_GOTO_AND_PLAY.size(), CMD_MS_GOTO_AND_PLAY ) == 0 )
#endif
{ {
size_t i,j; size_t i,j;
......
...@@ -36,11 +36,9 @@ ...@@ -36,11 +36,9 @@
#undef PRAGMA_PACK_END #undef PRAGMA_PACK_END
#if defined(__GNUC__) #if defined(__GNUC__)
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ATTRIBUTE_PACKED __attribute__ ((packed)) #define ATTRIBUTE_PACKED __attribute__ ((packed))
#define PRAGMA_PACK 0 #define PRAGMA_PACK 0
#endif #endif
#endif
#if !defined(ATTRIBUTE_PACKED) #if !defined(ATTRIBUTE_PACKED)
#define ATTRIBUTE_PACKED #define ATTRIBUTE_PACKED
......
...@@ -179,13 +179,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -179,13 +179,8 @@ static int Open( vlc_object_t * p_this )
continue; // don't reuse the original opened file continue; // don't reuse the original opened file
} }
#if defined(__GNUC__) && (__GNUC__ < 3)
if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
!s_filename.compare("mka", s_filename.length() - 3, 3))
#else
if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") || if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
!s_filename.compare(s_filename.length() - 3, 3, "mka")) !s_filename.compare(s_filename.length() - 3, 3, "mka"))
#endif
{ {
// test wether this file belongs to our family // test wether this file belongs to our family
const uint8_t *p_peek; const uint8_t *p_peek;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment