Takashi Iwai
ddfcaec6aa
- Upstream fix backport: 0002-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch - Upstream fix for PCM segfault regression (bsc#1215167): 0003-pcm-Fix-segfault-with-32bit-libs.patch OBS-URL: https://build.opensuse.org/request/show/1110009 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=317
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 6 Sep 2023 15:16:44 +0200
|
|
Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
|
|
|
|
It solves the musl libc compilation issue.
|
|
|
|
control.c: In function 'snd_ctl_open_conf':
|
|
../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
|
|
98 | #define SND_DLSYM_VERSION(version) __STRING(version)
|
|
| ^~~~~~~~
|
|
|
|
Fixes: https://github.com/alsa-project/alsa-lib/issues/350
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
include/global.h | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/global.h b/include/global.h
|
|
index dfe9bc2b54bf..3ecaeee898c5 100644
|
|
--- a/include/global.h
|
|
+++ b/include/global.h
|
|
@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
|
|
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
|
#endif
|
|
|
|
+#ifndef __STRING
|
|
+/** \brief Return 'x' argument as string */
|
|
+#define __STRING(x) #x
|
|
+#endif
|
|
+
|
|
#ifdef PIC /* dynamic build */
|
|
|
|
/** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
|
|
@@ -71,11 +76,6 @@ struct snd_dlsym_link {
|
|
|
|
extern struct snd_dlsym_link *snd_dlsym_start;
|
|
|
|
-#ifndef __STRING
|
|
-/** \brief Return 'x' argument as string */
|
|
-#define __STRING(x) #x
|
|
-#endif
|
|
-
|
|
/** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
|
|
#define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
|
|
/**
|
|
--
|
|
2.35.3
|
|
|