xref: /OK3568_Linux_fs/buildroot/package/libsidplay2/0003-gcc6.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1Fix build with gcc6
2
3gcc6 triggers an error during build:
4
5xsid.cpp:101:1: error: narrowing conversion of ''\200'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
6 };
7 ^
8xsid.cpp:101:1: error: narrowing conversion of ''\224'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
9xsid.cpp:101:1: error: narrowing conversion of ''\251'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
10xsid.cpp:101:1: error: narrowing conversion of ''\274'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
11xsid.cpp:101:1: error: narrowing conversion of ''\316'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
12xsid.cpp:101:1: error: narrowing conversion of ''\341'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
13xsid.cpp:101:1: error: narrowing conversion of ''\362'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing]
14
15To fix the problem change the array type from int8_t to char as proposed
16by Khem Raj:
17http://lists.busybox.net/pipermail/buildroot/2016-August/169540.html
18
19Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
20
21diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp
22--- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp	2004-06-14 22:08:02.000000000 +0200
23+++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp	2016-08-12 18:10:20.000000000 +0200
24@@ -94,7 +94,7 @@
25     '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f'
26 };
27 */
28-const int8_t XSID::sampleConvertTable[16] =
29+const char XSID::sampleConvertTable[16] =
30 {
31     '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
32     '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
33diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h
34--- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h	2004-06-14 22:08:02.000000000 +0200
35+++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h	2016-08-12 18:11:01.000000000 +0200
36@@ -238,7 +238,7 @@
37     uint8_t             sidData0x18;
38     bool                _sidSamples;
39     int8_t              sampleOffset;
40-    static const int8_t sampleConvertTable[16];
41+    static const char sampleConvertTable[16];
42     bool                wasRunning;
43
44 private:
45