From: Pavel Machek <pavel@suse.cz>
Date: Mon, 14 Apr 2008 16:31:35 +0000 (+0200)
Subject: [ALSA] sound/core.h: evil #ifdefs
X-Git-Tag: v2.6.26-rc1~1087^2~49
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad5fada51d33b408ad3d2d0848ef6744b5daf06f;p=linux-2.6

[ALSA] sound/core.h: evil #ifdefs

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>
---

diff --git a/include/sound/core.h b/include/sound/core.h
index 356659de6b..695ee53488 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -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 */