Takashi Iwai
558ddf7e27
- Backport upstream fixes: cleanups, non-glibc build fixes, fixes and enhancements of pcm_file plugin, etc. 0010-remove-unnecessary-obsolete-compat-hsearch_r.c.patch 0011-local.h-include-sys-types.h-to-fix-issues-with-pcm.h.patch 0012-test-chmap-Add-missing-usage-text-for-s-option.patch 0013-include-global.h-don-t-define-timeval-and-timespec-s.patch 0014-conf.c-use-portable-way-to-initialize-recursive-mute.patch 0015-pcm_file-fix-SEGFAULT-if-file-option-is-missing-whil.patch 0016-pcm_file-fixed-memory-leak.patch 0017-pcm_file-don-t-touch-infile-on-playback-and-output-f.patch 0018-pcm_file-document-new-argument-to-snd_pcm_file_open.patch - Fix aborting in races at closing dmix streams (bnc#852446): 0019-dmix-Don-t-use-assert-and-abort.patch - Don't include modprobe.d hack for 12.2 and older distros, which seem broken on them OBS-URL: https://build.opensuse.org/request/show/208679 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=143
37 lines
971 B
Diff
37 lines
971 B
Diff
From 7d06b3ed9fda0220c2863ee20acd10c32cf313fd Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 8 Nov 2013 12:30:04 +0100
|
|
Subject: [PATCH] include/global.h - don't define timeval and timespec
|
|
structures for !glibc
|
|
|
|
On request from John Spencer <maillist-alsa@barfooze.de> .
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
include/global.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/include/global.h b/include/global.h
|
|
index 3e3680fb698c..16a26dc83518 100644
|
|
--- a/include/global.h
|
|
+++ b/include/global.h
|
|
@@ -133,6 +133,7 @@ int snd_shm_area_destroy(struct snd_shm_area *area);
|
|
|
|
int snd_user_file(const char *file, char **result);
|
|
|
|
+#ifdef __GLIBC__
|
|
#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
|
|
struct timeval {
|
|
time_t tv_sec; /* seconds */
|
|
@@ -144,6 +145,7 @@ struct timespec {
|
|
long tv_nsec; /* nanoseconds */
|
|
};
|
|
#endif
|
|
+#endif
|
|
|
|
/** Timestamp */
|
|
typedef struct timeval snd_timestamp_t;
|
|
--
|
|
1.8.4.3
|
|
|