mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] (2/22) compile fixes for dmsound (static vs. extern)
@ 2005-08-25  5:23 Al Viro
  0 siblings, 0 replies; only message in thread
From: Al Viro @ 2005-08-25  5:23 UTC (permalink / raw)
  To: geert, torvalds; +Cc: linux-kernel, linux-m68k

sound/oss/dmasound/dmasound_atari.c has static expand_bal
sound/oss/dmasound/dmasound_q40.c has static expand_bal
sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal
sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c
all 4 include dmasound.h; extern for expand_bal used to be there,
which is a bloody bad idea, considering _atari and _q40.  Moved the
extern to trans_16.c.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC13-rc7-dmasound-lvalues/sound/oss/dmasound/dmasound.h RC13-rc7-dmasound-extern/sound/oss/dmasound/dmasound.h
--- RC13-rc7-dmasound-lvalues/sound/oss/dmasound/dmasound.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc7-dmasound-extern/sound/oss/dmasound/dmasound.h	2005-08-25 00:54:05.000000000 -0400
@@ -270,7 +270,6 @@
 #define SW_INPUT_VOLUME_SCALE	4
 #define SW_INPUT_VOLUME_DEFAULT	(128 / SW_INPUT_VOLUME_SCALE)
 
-extern int expand_bal;	/* Balance factor for expanding (not volume!) */
 extern int expand_read_bal;	/* Balance factor for reading */
 extern uint software_input_volume; /* software implemented recording volume! */
 
diff -urN RC13-rc7-dmasound-lvalues/sound/oss/dmasound/trans_16.c RC13-rc7-dmasound-extern/sound/oss/dmasound/trans_16.c
--- RC13-rc7-dmasound-lvalues/sound/oss/dmasound/trans_16.c	2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc7-dmasound-extern/sound/oss/dmasound/trans_16.c	2005-08-25 00:54:05.000000000 -0400
@@ -17,6 +17,7 @@
 #include <asm/uaccess.h>
 #include "dmasound.h"
 
+extern int expand_bal;	/* Balance factor for expanding (not volume!) */
 static short dmasound_alaw2dma16[] ;
 static short dmasound_ulaw2dma16[] ;
 

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-08-25  5:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-08-25  5:23 [PATCH] (2/22) compile fixes for dmsound (static vs. extern) Al Viro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®