Hi
I have done this patches for Mandrake kernel where we shipped
alsa. Forgot the patch that I put in the webpage, this are better.
This patch changes all the appartions of:
#endif FOO
by:
#endif /* FOO */
gcc-2.96 & gcc-3.0 don't like that construct, and notice that this was
not valid C in the first place. Resulting code compile also witohut
errors with egcs-1.1.2.
If you have any questions/comments, please told me.
Later, Juan.
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/cards/card-wavefront.c
alsa-driver-0.5.12-hack/cards/card-wavefront.c
--- alsa-driver-0.5.12/cards/card-wavefront.c Mon Oct 22 15:33:35 2001
+++ alsa-driver-0.5.12-hack/cards/card-wavefront.c Thu Nov 8 13:59:56 2001
@@ -93,7 +93,7 @@
MODULE_PARM_DESC(snd_isapnp_id, "ISA PnP Device ID (0x7532 or 0x7632)
[list=0x7532,0x7632]");
#endif
-#endif MODULE_PARM
+#endif /* MODULE_PARM */
static snd_wavefront_card_t *wavefront_cards[SND_CARDS] = SND_DEFAULT_PTR;
@@ -330,7 +330,7 @@
#endif
}
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
static void snd_wavefront_use_inc(snd_card_t * card)
{
@@ -544,7 +544,7 @@
goto __nodev;
}
}
-#endif 0
+#endif /* 0 */
acard->wavefront.irq = snd_ics2115_irq[dev];
@@ -700,7 +700,7 @@
snd_printk (LOGNAME "probing isn't supported\n");
return -ENODEV;
}
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
card = snd_card_new (snd_index[dev],
snd_id[dev],
snd_wavefront_use_inc,
@@ -724,7 +724,7 @@
return -ENODEV;
}
}
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
card->private_data = acard;
card->private_free = NULL;
@@ -732,7 +732,7 @@
if (snd_wavefront_resources (dev, acard, card) < 0) {
#ifdef __ISAPNP__
snd_wavefront_deactivate (acard);
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
snd_card_free (card);
return -EBUSY;
}
@@ -904,7 +904,7 @@
__nodev:
#ifdef __ISAPNP__
snd_wavefront_deactivate (acard);
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
snd_card_free(card);
return -ENXIO;
}
@@ -938,7 +938,7 @@
acard->ctrl = NULL;
acard->mpu = NULL;
acard->synth = NULL;
-#endif __ISAPNP__
+#endif /* __ISAPNP__ */
if (snd_wavefront_probe (dev, acard) < 0) {
snd_kfree (acard);
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/include/snd_wavefront.h
alsa-driver-0.5.12-hack/include/snd_wavefront.h
--- alsa-driver-0.5.12/include/snd_wavefront.h Sat Aug 5 20:34:17 2000
+++ alsa-driver-0.5.12-hack/include/snd_wavefront.h Thu Nov 8 13:59:56 2001
@@ -154,5 +154,5 @@
#define LOGNAME "WaveFront: "
-#endif __SND_WAVEFRONT_H__
+#endif /* __SND_WAVEFRONT_H__ */
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/include/wavefront.h alsa-driver-0.5.12-hack/include/wavefront.h
--- alsa-driver-0.5.12/include/wavefront.h Tue Jul 13 11:40:34 1999
+++ alsa-driver-0.5.12-hack/include/wavefront.h Thu Nov 8 13:59:56 2001
@@ -42,7 +42,7 @@
member, which has the same semantics anyway.
*/
-#endif __GNUC__
+#endif /* __GNUC__ */
/***************************** WARNING ********************************
PLEASE DO NOT MODIFY THIS FILE IN ANY WAY THAT AFFECTS ITS ABILITY TO
@@ -51,11 +51,11 @@
#ifndef NUM_MIDIKEYS
#define NUM_MIDIKEYS 128
-#endif NUM_MIDIKEYS
+#endif /* NUM_MIDIKEYS */
#ifndef NUM_MIDICHANNELS
#define NUM_MIDICHANNELS 16
-#endif NUM_MIDICHANNELS
+#endif /* NUM_MIDICHANNELS */
/* These are very useful/important. the original wavefront interface
was developed on a 16 bit system, where sizeof(int) = 2
@@ -683,5 +683,5 @@
#define WFFX_MEMSET 69
-#endif __WAVEFRONT_H__
+#endif /* __WAVEFRONT_H__ */
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/include/yss225.h alsa-driver-0.5.12-hack/include/yss225.h
--- alsa-driver-0.5.12/include/yss225.h Tue Jul 13 11:40:34 1999
+++ alsa-driver-0.5.12-hack/include/yss225.h Thu Nov 8 13:59:56 2001
@@ -20,5 +20,5 @@
extern unsigned char coefficients3[404];
-#endif __ys225_h__
+#endif /* __ys225_h__ */
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/kernel/seq/seq_system.c
alsa-driver-0.5.12-hack/kernel/seq/seq_system.c
--- alsa-driver-0.5.12/kernel/seq/seq_system.c Thu Jan 20 13:14:50 2000
+++ alsa-driver-0.5.12-hack/kernel/seq/seq_system.c Thu Nov 8 15:32:07 2001
@@ -25,7 +25,7 @@
#include "seq_queue.h"
/* define TRACE_ANNOUNCEMENTS to get every announcement traced to syslog/console */
-#undef TRACE_ANNOUNCEMENTS 1
+#undef TRACE_ANNOUNCEMENTS
/* internal client that provide system services, access to timer etc. */
diff -u alsa-driver-0.5.12/lowlevel/isa/wavefront.c.orig
alsa-driver-0.5.12/lowlevel/isa/wavefront.c
--- alsa-driver-0.5.12/lowlevel/isa/wavefront.c.orig Mon Oct 22 15:33:48 2001
+++ alsa-driver-0.5.12/lowlevel/isa/wavefront.c Thu Nov 8 20:13:28 2001
@@ -100,7 +100,7 @@
MODULE_PARM(osrun_time,"i");
MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");
MODULE_LICENSE("GPL");
-#endif MODULE_PARM
+#endif /* MODULE_PARM */
/*
* This sucks, hopefully it'll get standardised
@@ -141,7 +141,7 @@
}
#else
#define DPRINT(cond, format, args...)
-#endif WF_DEBUG
+#endif /* WF_DEBUG */
#define LOGNAME "WaveFront: "
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/lowlevel/isa/wavefront_fx.c
alsa-driver-0.5.12-hack/lowlevel/isa/wavefront_fx.c
--- alsa-driver-0.5.12/lowlevel/isa/wavefront_fx.c Mon Oct 22 15:33:48 2001
+++ alsa-driver-0.5.12-hack/lowlevel/isa/wavefront_fx.c Thu Nov 8 13:59:56 2001
@@ -25,7 +25,7 @@
MODULE_AUTHOR("Paul Barton-Davis <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("ALSA driver for Turtle Beach Tropez+ YSS225 FX Processor");
MODULE_LICENSE("GPL");
-#endif MODULE_PARM
+#endif /* MODULE_PARM */
/* Control bits for the Load Control Register
*/
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/lowlevel/pci/cs461x.c alsa-driver-0.5.12-hack/lowlevel/pci/cs461x.c
--- alsa-driver-0.5.12/lowlevel/pci/cs461x.c Mon Oct 22 15:33:48 2001
+++ alsa-driver-0.5.12-hack/lowlevel/pci/cs461x.c Thu Nov 8 13:59:56 2001
@@ -1849,11 +1849,11 @@
*/
#ifndef PCI_VENDOR_ID_INTEL
#define PCI_VENDOR_ID_INTEL 0x8086
-#endif PCI_VENDOR_ID_INTEL
+#endif /* PCI_VENDOR_ID_INTEL */
#ifndef PCI_DEVICE_ID_INTEL_82371AB_3
#define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113
-#endif PCI_DEVICE_ID_INTEL_82371AB_3
+#endif /* PCI_DEVICE_ID_INTEL_82371AB_3 */
/*
* Handle the CLKRUN on a thinkpad. We must disable CLKRUN support
diff -urN --exclude-from=/home/mitica/quintela/config/misc/dontdiff
alsa-driver-0.5.12/lowlevel/sb/sb16_csp.c
alsa-driver-0.5.12-hack/lowlevel/sb/sb16_csp.c
--- alsa-driver-0.5.12/lowlevel/sb/sb16_csp.c Mon Oct 22 15:33:49 2001
+++ alsa-driver-0.5.12-hack/lowlevel/sb/sb16_csp.c Thu Nov 8 19:01:42 2001
@@ -33,7 +33,7 @@
MODULE_DESCRIPTION("ALSA driver for SB16 Creative Signal Processor\n\
classes: {sound}");
MODULE_LICENSE("GPL");
-#endif MODULE_PARM
+#endif /* MODULE_PARM */
#ifdef SND_LITTLE_ENDIAN
#define CSP_HDR_VALUE(a,b,c,d) ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24))
--
In theory, practice and theory are the same, but in practice they
are different -- Larry McVoy
_______________________________________________
Alsa-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
