[alsa-cvslog] CVS: alsa-kernel/core rawmidi.c,1.34,1.35 sound_oss.c,1.9,1.10

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv5339/core

Modified Files:
        rawmidi.c sound_oss.c 
Log Message:
Fixed module/solid kernel #ifdef tests

Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rawmidi.c   30 May 2003 13:37:36 -0000      1.34
+++ rawmidi.c   21 Jun 2003 07:52:37 -0000      1.35
@@ -1437,7 +1437,7 @@
        return snd_rawmidi_free(rmidi);
 }
 
-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
+#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && 
defined(CONFIG_SND_SEQUENCER_MODULE))
 static void snd_rawmidi_dev_seq_free(snd_seq_device_t *device)
 {
        snd_rawmidi_t *rmidi = snd_magic_cast(snd_rawmidi_t, device->private_data, 
return);
@@ -1513,7 +1513,7 @@
                }
        }
        rmidi->proc_entry = entry;
-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
+#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && 
defined(CONFIG_SND_SEQUENCER_MODULE))
        if (!rmidi->ops || !rmidi->ops->dev_register) { /* own registration mechanism 
*/
                if (snd_seq_device_new(rmidi->card, rmidi->device, 
SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &rmidi->seq_dev) >= 0) {
                        rmidi->seq_dev->private_data = rmidi;
@@ -1568,7 +1568,7 @@
                rmidi->ops->dev_unregister(rmidi);
        snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);
        up(&register_mutex);
-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
+#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && 
defined(CONFIG_SND_SEQUENCER_MODULE))
        if (rmidi->seq_dev) {
                snd_device_free(rmidi->card, rmidi->seq_dev);
                rmidi->seq_dev = NULL;

Index: sound_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound_oss.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sound_oss.c 13 May 2003 07:51:08 -0000      1.9
+++ sound_oss.c 21 Jun 2003 07:52:37 -0000      1.10
@@ -23,7 +23,7 @@
 
 #ifdef CONFIG_SND_OSSEMUL
 
-#if !defined(CONFIG_SOUND) && !defined(CONFIG_SOUND_MODULE)
+#if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE))
 #error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel."
 #endif
 



-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog