| 1 | From: Antonio Larrosa <[email protected]>
|
| 2 | Date: Fri, 10 Mar 2017 15:40:02 +0100
|
| 3 | Subject: Fix signature of multiplyCheckOverflow. It returns a bool, not an int
|
| 4 |
|
| 5 | ---
|
| 6 | libaudiofile/modules/MSADPCM.cpp | 2 +-
|
| 7 | sfcommands/sfconvert.c | 2 +-
|
| 8 | 2 files changed, 2 insertions(+), 2 deletions(-)
|
| 9 |
|
| 10 | diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp
|
| 11 | index ef9c38c..d8c9553 100644
|
| 12 | |
| 13 | |
| 14 | @@ -116,7 +116,7 @@ int firstBitSet(int x)
|
| 15 | #define __has_builtin(x) 0
|
| 16 | #endif
|
| 17 |
|
| 18 | -int multiplyCheckOverflow(int a, int b, int *result)
|
| 19 | +bool multiplyCheckOverflow(int a, int b, int *result)
|
| 20 | {
|
| 21 | #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
|
| 22 | return __builtin_mul_overflow(a, b, result);
|
| 23 | diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c
|
| 24 | index 970a3e4..367f7a5 100644
|
| 25 | |
| 26 | |
| 27 | @@ -60,7 +60,7 @@ int firstBitSet(int x)
|
| 28 | #define __has_builtin(x) 0
|
| 29 | #endif
|
| 30 |
|
| 31 | -int multiplyCheckOverflow(int a, int b, int *result)
|
| 32 | +bool multiplyCheckOverflow(int a, int b, int *result)
|
| 33 | {
|
| 34 | #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
|
| 35 | return __builtin_mul_overflow(a, b, result);
|