From a80eb482db3944707d159a29b544abc509375e44 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 26 Feb 2004 18:34:58 +0000 Subject: [PATCH] Removed ALSA_OSS_WRAPPER environment variable --- alsa/alsa-oss.c | 5 +---- alsa/aoss.in | 2 +- alsa/testaoss.in | 3 +-- test/testaoss.in | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/alsa/alsa-oss.c b/alsa/alsa-oss.c index 497e7e4..08aec24 100644 --- a/alsa/alsa-oss.c +++ b/alsa/alsa-oss.c @@ -693,10 +693,7 @@ static void initialize() __attribute__ ((constructor)); static void initialize() { - char *s = getenv("ALSA_OSS_WRAPPER"); - if (s == NULL) - return; - s = getenv("ALSA_OSS_DEBUG"); + char *s = getenv("ALSA_OSS_DEBUG"); if (s) oss_wrapper_debug = 1; open_max = sysconf(_SC_OPEN_MAX); diff --git a/alsa/aoss.in b/alsa/aoss.in index c1b0ad7..98c7ddc 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -6,4 +6,4 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -ALSA_OSS_WRAPPER=1 LD_PRELOAD=@libdir@/libaoss.so exec "$@" +LD_PRELOAD=@libdir@/libaoss.so exec "$@" diff --git a/alsa/testaoss.in b/alsa/testaoss.in index 9020147..d7642a5 100644 --- a/alsa/testaoss.in +++ b/alsa/testaoss.in @@ -5,5 +5,4 @@ # testaoss prefix=@top_srcdir@ -ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@" - +LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@" diff --git a/test/testaoss.in b/test/testaoss.in index bd04c7f..d7642a5 100644 --- a/test/testaoss.in +++ b/test/testaoss.in @@ -5,4 +5,4 @@ # testaoss prefix=@top_srcdir@ -ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@" +LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec "$@" -- 2.47.1