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