Dominique Leuenberger
6ec9e6d8a0
- Backport upstream fixes: 0001-local.h-use-__kernel_off_t-from-linux-types.h.patch 0002-conf-cards-add-Audio-Advantage-Micro-II.patch 0003-pcm-Fix-a-wrong-value-shown-in-the-error-message-in-.patch 0004-UCM-Document-some-standard-values.patch 0005-hdspm.h-Update-LTC-ioctl-to-use-struct-hdspm_ltc.patch 0006-Update-iatomic.h-functions-definitions-for-mips.patch OBS-URL: https://build.opensuse.org/request/show/197613 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=139
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001
|
|
From: Kai Kang <jiashuo.kang at gmail.com>
|
|
Date: Thu, 15 Aug 2013 17:17:19 +0800
|
|
Subject: [PATCH 6/6] Update iatomic.h functions definitions for mips
|
|
|
|
Functions atomic_add(s) and atomic_sub(s) are defined with 'extern
|
|
__inline__' that may cause compile fails when cross compile for mips.
|
|
The error message looks like:
|
|
|
|
| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope':
|
|
| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub'
|
|
|
|
Replace the 'extern __inline__' with 'static __inline__' to fix this
|
|
issue.
|
|
|
|
Signed-off-by: Kai Kang <jiashuo.kang at gmail.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
include/iatomic.h | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/iatomic.h b/include/iatomic.h
|
|
index 5711fe8..2393297 100644
|
|
--- a/include/iatomic.h
|
|
+++ b/include/iatomic.h
|
|
@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
|
|
* Atomically adds @i to @v. Note that the guaranteed useful range
|
|
* of an atomic_t is only 24 bits.
|
|
*/
|
|
-extern __inline__ void atomic_add(int i, atomic_t * v)
|
|
+static __inline__ void atomic_add(int i, atomic_t * v)
|
|
{
|
|
unsigned long temp;
|
|
|
|
@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
|
|
* Atomically subtracts @i from @v. Note that the guaranteed
|
|
* useful range of an atomic_t is only 24 bits.
|
|
*/
|
|
-extern __inline__ void atomic_sub(int i, atomic_t * v)
|
|
+static __inline__ void atomic_sub(int i, atomic_t * v)
|
|
{
|
|
unsigned long temp;
|
|
|
|
@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
|
|
/*
|
|
* Same as above, but return the result value
|
|
*/
|
|
-extern __inline__ int atomic_add_return(int i, atomic_t * v)
|
|
+static __inline__ int atomic_add_return(int i, atomic_t * v)
|
|
{
|
|
unsigned long temp, result;
|
|
|
|
@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
|
|
return result;
|
|
}
|
|
|
|
-extern __inline__ int atomic_sub_return(int i, atomic_t * v)
|
|
+static __inline__ int atomic_sub_return(int i, atomic_t * v)
|
|
{
|
|
unsigned long temp, result;
|
|
|
|
--
|
|
1.8.4
|
|
|