Fixes for compilation with gcc 2.95.

This commit is contained in:
Moritz Bunkus 2003-09-30 13:46:52 +00:00
parent bdedb66d26
commit 3df07b41a9
4 changed files with 4 additions and 4 deletions

View File

@ -207,7 +207,7 @@ void extract_attachments(const char *file_name) {
} }
show_element(l0, 0, "Next level 0 element is not a segment but %s", show_element(l0, 0, "Next level 0 element is not a segment but %s",
typeid(*l0).name()); l0->Generic().DebugName);
l0->SkipData(*es, l0->Generic().Context); l0->SkipData(*es, l0->Generic().Context);
delete l0; delete l0;

View File

@ -120,7 +120,7 @@ void extract_chapters(const char *file_name, bool chapter_format_simple) {
} }
show_element(l0, 0, "Next level 0 element is not a segment but %s", show_element(l0, 0, "Next level 0 element is not a segment but %s",
typeid(*l0).name()); l0->Generic().DebugName);
l0->SkipData(*es, l0->Generic().Context); l0->SkipData(*es, l0->Generic().Context);
delete l0; delete l0;

View File

@ -120,7 +120,7 @@ void extract_tags(const char *file_name) {
} }
show_element(l0, 0, "Next level 0 element is not a segment but %s", show_element(l0, 0, "Next level 0 element is not a segment but %s",
typeid(*l0).name()); l0->Generic().DebugName);
l0->SkipData(*es, l0->Generic().Context); l0->SkipData(*es, l0->Generic().Context);
delete l0; delete l0;

View File

@ -818,7 +818,7 @@ void real_reader_c::assemble_packet(real_demuxer_t *dmx, unsigned char *p,
vpkg_offset = vpkg_length - vpkg_offset; vpkg_offset = vpkg_length - vpkg_offset;
} }
len = min(bc.get_len(), vpkg_length - vpkg_offset); len = min(bc.get_len(), (int)(vpkg_length - vpkg_offset));
segment.offset = vpkg_offset; segment.offset = vpkg_offset;
segment.data = (unsigned char *)safemalloc(len); segment.data = (unsigned char *)safemalloc(len);
segment.size = len; segment.size = len;