frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed "warning: invalid suffix on literal" with GCC 4.8 and C++11

Browse Source
This commit is contained in:
Klaus Schmidinger 2015-01-20 14:56:18 +01:00
parent 53db7fdc50
commit 24c9e45789
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2969,6 +2969,7 @@ Dominik Strasser <dominik@die-strassers.de>
Joerg Bornkessel <hd_brummy@gentoo.org> Joerg Bornkessel <hd_brummy@gentoo.org>
for adding LDFLAGS to the linker calls in the Makefiles for adding LDFLAGS to the linker calls in the Makefiles
for fixing font handling with fontconfig 2.9.0 or newer for fixing font handling with fontconfig 2.9.0 or newer
for fixing "warning: invalid suffix on literal" with GCC 4.8 and C++11
Andreas Oberritter <obi@opendreambox.org> Andreas Oberritter <obi@opendreambox.org>
for suggesting to retrieve the include path to the freetype2 header files for suggesting to retrieve the include path to the freetype2 header files

2
HISTORY
View File

@ -8417,3 +8417,5 @@ Video Disk Recorder Revision History
2015-01-20: Version 2.1.8 2015-01-20: Version 2.1.8
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed "warning: invalid suffix on literal" with GCC 4.8 and C++11 (thanks to Joerg
Bornkessel).

12
dvbsubtitle.c
View File

@ -7,7 +7,7 @@
* Original author: Marco Schluessler <marco@lordzodiac.de> * Original author: Marco Schluessler <marco@lordzodiac.de>
* With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
* *
* $Id: dvbsubtitle.c 3.9 2015/01/14 11:31:09 kls Exp $ * $Id: dvbsubtitle.c 3.10 2015/01/20 14:53:57 kls Exp $
*/ */
#include "dvbsubtitle.h" #include "dvbsubtitle.h"
@ -1042,7 +1042,7 @@ void cDvbSubtitlePage::Parse(int64_t Pts, cBitStream &bs)
default: dbgpages("unknown page state: %d<br>\n", pageState); default: dbgpages("unknown page state: %d<br>\n", pageState);
} }
bs.SkipBits(2); // reserved 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(); regionRefs.Clear();
while (!bs.IsEOF()) while (!bs.IsEOF())
regionRefs.Add(new cSubtitleRegionRef(bs)); regionRefs.Add(new cSubtitleRegionRef(bs));
@ -1073,7 +1073,7 @@ void cDvbSubtitlePage::ParsePgs(int64_t Pts, cBitStream &bs)
default: dbgpages("unknown page state: %d<br>\n", pageState); default: dbgpages("unknown page state: %d<br>\n", pageState);
} }
bs.SkipBits(6); 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(); regionRefs.Clear();
pending = true; pending = true;
} }
@ -1384,7 +1384,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
if (Length > PayloadOffset + SubstreamHeaderLength) { if (Length > PayloadOffset + SubstreamHeaderLength) {
int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1; int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
if (pts >= 0) 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 const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
if (ResetSubtitleAssembler) if (ResetSubtitleAssembler)
@ -1420,7 +1420,7 @@ int cDvbSubtitleConverter::Convert(const uchar *Data, int Length)
if (Length > PayloadOffset) { if (Length > PayloadOffset) {
int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1; int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
if (pts >= 0) if (pts >= 0)
dbgconverter("converter PTS: %"PRId64"<br>\n", pts); dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
const uchar *data = Data + PayloadOffset; const uchar *data = Data + PayloadOffset;
int length = Length - PayloadOffset; int length = Length - PayloadOffset;
if (length > 0) { if (length > 0) {
@ -1488,7 +1488,7 @@ void cDvbSubtitleConverter::Action(void)
dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count()); dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
sb->Draw(osd); sb->Draw(osd);
Timeout.Set(sb->Timeout() * 1000); 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 else

6
recording.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: recording.c 3.21 2015/01/17 14:52:28 kls Exp $ * $Id: recording.c 3.22 2015/01/20 14:53:57 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -1749,7 +1749,7 @@ void cDirCopier::Action(void)
off_t FileSizeSrc = FileSize(FileNameSrc); off_t FileSizeSrc = FileSize(FileNameSrc);
off_t FileSizeDst = FileSize(FileNameDst); off_t FileSizeDst = FileSize(FileNameDst);
if (FileSizeSrc != FileSizeDst) { if (FileSizeSrc != FileSizeDst) {
esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst); esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst);
break; break;
} }
} }
@ -2476,7 +2476,7 @@ cIndexFile::cIndexFile(const char *FileName, bool Record, bool IsPesRecording, b
delta = int(buf.st_size % sizeof(tIndexTs)); delta = int(buf.st_size % sizeof(tIndexTs));
if (delta) { if (delta) {
delta = sizeof(tIndexTs) - 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); last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
if ((!Record || Update) && last >= 0) { if ((!Record || Update) && last >= 0) {

4
remote.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: remote.c 3.2 2014/02/15 12:40:39 kls Exp $ * $Id: remote.c 3.3 2015/01/20 14:53:57 kls Exp $
*/ */
#include "remote.h" #include "remote.h"
@ -124,7 +124,7 @@ bool cRemote::PutMacro(eKeys Key)
bool cRemote::Put(uint64_t Code, bool Repeat, bool Release) bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
{ {
char buffer[32]; char buffer[32];
snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code); snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code);
return Put(buffer, Repeat, Release); return Put(buffer, Repeat, Release);
} }