66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
From 2251737b3b175925684ec0d37029ff4cb521d302 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Greffrath <fabian@greffrath.com>
|
|
Date: Tue, 17 Dec 2024 10:38:47 +0100
|
|
Subject: [PATCH] Include <stdbool.h> instead of redefining `bool`, `true` and
|
|
`false` keywords
|
|
|
|
Fixes #1049
|
|
|
|
Upstream: https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
src/ALAC/alac_decoder.c | 6 +-----
|
|
src/ALAC/alac_encoder.c | 7 +------
|
|
2 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c
|
|
index 978919a70..417645316 100644
|
|
--- a/src/ALAC/alac_decoder.c
|
|
+++ b/src/ALAC/alac_decoder.c
|
|
@@ -28,6 +28,7 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stddef.h>
|
|
+#include <stdbool.h>
|
|
#include <string.h>
|
|
|
|
#include "alac_codec.h"
|
|
@@ -40,11 +41,6 @@
|
|
#include "ALACBitUtilities.h"
|
|
#include "EndianPortable.h"
|
|
|
|
-typedef enum
|
|
-{ false = 0,
|
|
- true = 1
|
|
-} bool ;
|
|
-
|
|
// constants/data
|
|
const uint32_t kMaxBitDepth = 32 ; // max allowed bit depth is 32
|
|
|
|
diff --git a/src/ALAC/alac_encoder.c b/src/ALAC/alac_encoder.c
|
|
index 29012f3f4..c9395b1d5 100644
|
|
--- a/src/ALAC/alac_encoder.c
|
|
+++ b/src/ALAC/alac_encoder.c
|
|
@@ -32,6 +32,7 @@
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include <stdbool.h>
|
|
#include <string.h>
|
|
|
|
#include "sfendian.h"
|
|
@@ -46,12 +47,6 @@
|
|
#include "ALACAudioTypes.h"
|
|
#include "EndianPortable.h"
|
|
|
|
-typedef enum
|
|
-{
|
|
- false = 0,
|
|
- true = 1
|
|
-} bool ;
|
|
-
|
|
static void GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ;
|
|
|
|
static int32_t EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ;
|