[vlc-commits] MKV: compilation with EGCS is not supported anymore

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 17 18:31:25 2011 +0300| [dedc5a17d1daadc469e066f24e53d822d105aad0] | committer: Rémi Denis-Courmont

MKV: compilation with EGCS is not supported anymore

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dedc5a17d1daadc469e066f24e53d822d105aad0
---

 modules/demux/mkv/chapter_command.cpp |    4 ----
 modules/demux/mkv/demux.hpp           |    2 --
 modules/demux/mkv/mkv.cpp             |    5 -----
 3 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/modules/demux/mkv/chapter_command.cpp b/modules/demux/mkv/chapter_command.cpp
index d74f4ee..a220aee 100644
--- a/modules/demux/mkv/chapter_command.cpp
+++ b/modules/demux/mkv/chapter_command.cpp
@@ -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() );
 
-#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 )
-#endif
     {
         size_t i,j;
 
diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
index 19c64d6..39588ea 100644
--- a/modules/demux/mkv/demux.hpp
+++ b/modules/demux/mkv/demux.hpp
@@ -36,11 +36,9 @@
 #undef PRAGMA_PACK_END
 
 #if defined(__GNUC__)
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define ATTRIBUTE_PACKED __attribute__ ((packed))
 #define PRAGMA_PACK 0
 #endif
-#endif
 
 #if !defined(ATTRIBUTE_PACKED)
 #define ATTRIBUTE_PACKED
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 4eaeee5..ff1c423 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -179,13 +179,8 @@ static int Open( vlc_object_t * p_this )
                             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") ||
                             !s_filename.compare(s_filename.length() - 3, 3, "mka"))
-#endif
                         {
                             // test wether this file belongs to our family
                             const uint8_t *p_peek;