From ca68dadf585aadb8adf582cd94f8fcdd4592e09f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Jun 2022 10:31:49 +0200 Subject: [PATCH] src/convert.c: remove have_cplusplus Remove have_cplusplus function for simplicity and to avoid the following build failure: /home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/aarch64-buildroot-linux-uclibc/10.3.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: ./.libs/libbayer2rgb3.so: undefined reference to `__bayer2rgb_missing_convert_dumb_implementation' Fixes: - http://autobuild.buildroot.org/results/69a637b7f1422ce2bf04dda573abb09388b9a02d Signed-off-by: Fabrice Fontaine --- src/convert.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/convert.c b/src/convert.c index c852a14..83d631d 100644 --- a/src/convert.c +++ b/src/convert.c @@ -27,25 +27,16 @@ static bool have_neon() #endif } -static bool have_cplusplus() -{ -#ifdef HAVE_CPLUSPLUS - return true; -#else - return false; -#endif -} - void bayer2rgb_convert_dumb(struct image_in const *input, struct image_out const *output, struct image_conversion_info *info) { +#ifdef HAVE_CPLUSPLUS + return bayer2rgb_convert_cc(input, output, info); +#else extern void __bayer2rgb_missing_convert_dumb_implementation(); - - if (have_cplusplus()) - return bayer2rgb_convert_cc(input, output, info); - else - __bayer2rgb_missing_convert_dumb_implementation(); + __bayer2rgb_missing_convert_dumb_implementation(); +#endif } void bayer2rgb_convert(struct image_in const *input, -- 2.35.1