Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 1 | From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Opdenacker <michael.opdenacker@bootlin.com> |
| 3 | Date: Wed, 6 Sep 2023 15:16:44 +0200 |
| 4 | Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block |
| 5 | |
| 6 | From: Jaroslav Kysela <perex@perex.cz> |
| 7 | |
| 8 | It solves the musl libc compilation issue. |
| 9 | |
| 10 | control.c: In function 'snd_ctl_open_conf': |
| 11 | ../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] |
| 12 | 98 | #define SND_DLSYM_VERSION(version) __STRING(version) |
| 13 | | ^~~~~~~~ |
| 14 | |
| 15 | Fixes: https://github.com/alsa-project/alsa-lib/issues/350 |
| 16 | Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c] |
| 17 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> |
| 18 | --- |
| 19 | include/global.h | 10 +++++----- |
| 20 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 21 | |
| 22 | diff --git a/include/global.h b/include/global.h |
| 23 | index dfe9bc2b..3ecaeee8 100644 |
| 24 | --- a/include/global.h |
| 25 | +++ b/include/global.h |
| 26 | @@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); |
| 27 | #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) |
| 28 | #endif |
| 29 | |
| 30 | +#ifndef __STRING |
| 31 | +/** \brief Return 'x' argument as string */ |
| 32 | +#define __STRING(x) #x |
| 33 | +#endif |
| 34 | + |
| 35 | #ifdef PIC /* dynamic build */ |
| 36 | |
| 37 | /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ |
| 38 | @@ -71,11 +76,6 @@ struct snd_dlsym_link { |
| 39 | |
| 40 | extern struct snd_dlsym_link *snd_dlsym_start; |
| 41 | |
| 42 | -#ifndef __STRING |
| 43 | -/** \brief Return 'x' argument as string */ |
| 44 | -#define __STRING(x) #x |
| 45 | -#endif |
| 46 | - |
| 47 | /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ |
| 48 | #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version |
| 49 | /** |
| 50 | -- |
| 51 | 2.34.1 |
| 52 | |