-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Am 18.01.2015 11:38, schrieb Klaus Schmidinger:
> VDR developer version 2.1.7 is now available at
>
> ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.7.tar.bz2
Attached patch will fix some issues with gcc-4.8 and CXXFLAGS -std=C++11
warning: invalid suffix on literal; C++11 requires a space between
literal and identifier [-Wliteral-suffix]
in dvbsubtitle.c recording.c remote.c
Tested also with gcc-4.8 without extended -std-=C++11
Thanks for the new version :)
/dev/joerg
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: added by hd_brummy@xxxxxxxxxx
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iD8DBQFUu63qdn07HTTCgIoRAgJUAKCW9F9Ogk6Y2ONn6h6Qecw0F6j7mQCeLbBq
/Qwnw6kXcrtnLWvIADQHdgY=
=TO2y
-----END PGP SIGNATURE-----
Invalid suffix on Literal with GCC 4.8 and C++11
warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
Signed-of-by: Joerg Bornkessel <hd_brummy@xxxxxxxxxx> Jan/18/2015
diff -Naur vdr-2.1.7.orig/dvbsubtitle.c vdr-2.1.7/dvbsubtitle.c
--- vdr-2.1.7.orig/dvbsubtitle.c 2015-01-18 12:52:48.949414301 +0100
+++ vdr-2.1.7/dvbsubtitle.c 2015-01-18 13:04:01.889448784 +0100
@@ -1042,7 +1042,7 @@
default: dbgpages("unknown page state: %d<br>\n", pageState);
}
bs.SkipBits(2); // reserved
- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
regionRefs.Clear();
while (!bs.IsEOF())
regionRefs.Add(new cSubtitleRegionRef(bs));
@@ -1073,7 +1073,7 @@
default: dbgpages("unknown page state: %d<br>\n", pageState);
}
bs.SkipBits(6);
- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
regionRefs.Clear();
pending = true;
}
@@ -1384,7 +1384,7 @@
if (Length > PayloadOffset + SubstreamHeaderLength) {
int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
if (pts >= 0)
- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
+ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
if (ResetSubtitleAssembler)
@@ -1420,7 +1420,7 @@
if (Length > PayloadOffset) {
int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
if (pts >= 0)
- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
+ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
const uchar *data = Data + PayloadOffset;
int length = Length - PayloadOffset;
if (length > 0) {
@@ -1488,7 +1488,7 @@
dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
sb->Draw(osd);
Timeout.Set(sb->Timeout() * 1000);
- dbgconverter("PTS: %"PRId64" STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
+ dbgconverter("PTS: %" PRId64 " STC: %" PRId64 " (%" PRId64 ") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
}
}
else
diff -Naur vdr-2.1.7.orig/recording.c vdr-2.1.7/recording.c
--- vdr-2.1.7.orig/recording.c 2015-01-18 12:52:48.956080968 +0100
+++ vdr-2.1.7/recording.c 2015-01-18 13:05:42.346120598 +0100
@@ -1749,7 +1749,7 @@
off_t FileSizeSrc = FileSize(FileNameSrc);
off_t FileSizeDst = FileSize(FileNameDst);
if (FileSizeSrc != FileSizeDst) {
- esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
+ esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst);
break;
}
}
@@ -2476,7 +2476,7 @@
delta = int(buf.st_size % sizeof(tIndexTs));
if (delta) {
delta = sizeof(tIndexTs) - delta;
- esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
+ esyslog("ERROR: invalid file size (%" PRId64 ") in '%s'", buf.st_size, *fileName);
}
last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
if ((!Record || Update) && last >= 0) {
diff -Naur vdr-2.1.7.orig/remote.c vdr-2.1.7/remote.c
--- vdr-2.1.7.orig/remote.c 2015-01-18 12:52:48.949414301 +0100
+++ vdr-2.1.7/remote.c 2015-01-18 13:06:40.752790258 +0100
@@ -124,7 +124,7 @@
bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
{
char buffer[32];
- snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
+ snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code);
return Put(buffer, Repeat, Release);
}
_______________________________________________
vdr mailing list
vdr@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
