blob: 2c66cf4d00ac035fd282e7dd3f7f01a848af5cb9 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From a74c1e9c583375b9e55c29a36442485089e4b7f9 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 16 Dec 2016 12:42:06 +0100
4Subject: [PATCH 2/3] fix build on gcc6
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Stolen from [1]
10
11[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-narrowing.patch
12
13Upstrem-Status: Pending
14
15Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com>
16---
17 test/NeXT.cpp | 14 +++++++-------
18 1 file changed, 7 insertions(+), 7 deletions(-)
19
20diff --git a/test/NeXT.cpp b/test/NeXT.cpp
21index 7e39850..a37cea1 100644
22--- a/test/NeXT.cpp
23+++ b/test/NeXT.cpp
24@@ -37,13 +37,13 @@
25
26 #include "TestUtilities.h"
27
28-const char kDataUnspecifiedLength[] =
29+const signed char kDataUnspecifiedLength[] =
30 {
31 '.', 's', 'n', 'd',
32 0, 0, 0, 24, // offset of 24 bytes
33- 0xff, 0xff, 0xff, 0xff, // unspecified length
34+ -1, -1, -1, -1, // unspecified length
35 0, 0, 0, 3, // 16-bit linear
36- 0, 0, 172, 68, // 44100 Hz
37+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
38 0, 0, 0, 1, // 1 channel
39 0, 1,
40 0, 1,
41@@ -57,13 +57,13 @@ const char kDataUnspecifiedLength[] =
42 0, 55
43 };
44
45-const char kDataTruncated[] =
46+const signed char kDataTruncated[] =
47 {
48 '.', 's', 'n', 'd',
49 0, 0, 0, 24, // offset of 24 bytes
50 0, 0, 0, 20, // length of 20 bytes
51 0, 0, 0, 3, // 16-bit linear
52- 0, 0, 172, 68, // 44100 Hz
53+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
54 0, 0, 0, 1, // 1 channel
55 0, 1,
56 0, 1,
57@@ -152,13 +152,13 @@ TEST(NeXT, Truncated)
58 ASSERT_EQ(::unlink(testFileName.c_str()), 0);
59 }
60
61-const char kDataZeroChannels[] =
62+const signed char kDataZeroChannels[] =
63 {
64 '.', 's', 'n', 'd',
65 0, 0, 0, 24, // offset of 24 bytes
66 0, 0, 0, 2, // 2 bytes
67 0, 0, 0, 3, // 16-bit linear
68- 0, 0, 172, 68, // 44100 Hz
69+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
70 0, 0, 0, 0, // 0 channels
71 0, 1
72 };
73--
742.7.4
75