Skip to content

Commit 65fcd42

Browse files
committed
ext/libsamplerate: adjust config.h to be package exclusive
`config.h` being in `include` directory meant that it was included globally. It may cause it being indluded into other package (as global include) Added prefixes to libsamplerate syscfg settings.
1 parent 75b35ad commit 65fcd42

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ext/libsamplerate/include/config.h renamed to ext/libsamplerate/src/config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222

2323
#include "syscfg/syscfg.h"
2424

25-
#if MYNEWT_VAL(ENABLE_SINC_BEST_CONVERTER)
25+
#if MYNEWT_VAL(LIBSAMPLERATE_ENABLE_SINC_BEST_CONVERTER)
2626
#define ENABLE_SINC_BEST_CONVERTER 1
2727
#endif
2828

29-
#if MYNEWT_VAL(ENABLE_SINC_MEDIUM_CONVERTER)
29+
#if MYNEWT_VAL(LIBSAMPLERATE_ENABLE_SINC_MEDIUM_CONVERTER)
3030
#define ENABLE_SINC_MEDIUM_CONVERTER 1
3131
#endif
3232

33-
#if MYNEWT_VAL(ENABLE_SINC_FAST_CONVERTER)
33+
#if MYNEWT_VAL(LIBSAMPLERATE_ENABLE_SINC_FAST_CONVERTER)
3434
#define ENABLE_SINC_FAST_CONVERTER 1
3535
#endif
3636

37-
#if MYNEWT_VAL(LIBSAMPLER_NDEBUG)
37+
#if MYNEWT_VAL(LIBSAMPLERATE_LIBSAMPLER_NDEBUG)
3838
#define LIBSAMPLER_NDEBUG 1
3939
#endif
4040

ext/libsamplerate/syscfg.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
# under the License.
1717

1818
syscfg.defs:
19-
ENABLE_SINC_BEST_CONVERTER:
19+
LIBSAMPLERATE_ENABLE_SINC_BEST_CONVERTER:
2020
description: Enable SINC best converter
2121
value: 1
22-
ENABLE_SINC_MEDIUM_CONVERTER:
22+
LIBSAMPLERATE_ENABLE_SINC_MEDIUM_CONVERTER:
2323
description: Enable SINC medium converter
2424
value: 1
25-
ENABLE_SINC_FAST_CONVERTER:
25+
LIBSAMPLERATE_ENABLE_SINC_FAST_CONVERTER:
2626
description: Enable SINC fastest converter
2727
value: 1
28-
LIBSAMPLER_NDEBUG:
28+
LIBSAMPLERATE_LIBSAMPLER_NDEBUG:
2929
description: Define NDEBUG for resampler code (turns off asserts)
3030
value: 0

0 commit comments

Comments
 (0)