]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] sound/core.h: evil #ifdefs
authorPavel Machek <pavel@suse.cz>
Mon, 14 Apr 2008 16:31:35 +0000 (18:31 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:36 +0000 (12:00 +0200)
snd_minor_info_oss_* is an function returning int _or_ comment,
depending on config parameters. That is truly evil, fix it.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/core.h

index 356659de6b8534d397e4d1d08e6847a457068002..695ee53488a382ab85d90f1deb5e3b83a5fe82e6 100644 (file)
@@ -277,8 +277,8 @@ int snd_minor_info_done(void);
 int snd_minor_info_oss_init(void);
 int snd_minor_info_oss_done(void);
 #else
-#define snd_minor_info_oss_init() /*NOP*/
-#define snd_minor_info_oss_done() /*NOP*/
+static inline int snd_minor_info_oss_init(void) { return 0; }
+static inline int snd_minor_info_oss_done(void) { return 0; }
 #endif
 
 /* memory.c */