Changeset 99

Timestamp:

May 8, 2007, 5:31:55 AM (18 years ago)

Author:

Brendan Oakley

Message:

Fixed a merge mistake in core.h

File:

• GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

@@ -322 +322 @@
 /* --- */
 
+#ifdef TARGET_OS2
+
+#define snd_printk printk
+
+#ifdef CONFIG_SND_DEBUG
+
+#define snd_printd snd_printk
+#define snd_assert(expr, retval) \
+        if (!(expr)) {\
+                snd_printk("BUG? (%s)\n", __STRING(expr));\
+                ##retval;\
+        }
+
+#define snd_runtime_check snd_assert
+#define snd_runtime_check_continue snd_assert_continue
+
+
+#else /* !CONFIG_SND_DEBUG */
+
+#define snd_printd  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#define snd_assert(expr, retval) \
+        if (!(expr)) {\
+                ##retval;\
+        }
+#define snd_runtime_check snd_assert
+
+#endif /* CONFIG_SND_DEBUG */
+
+#ifdef CONFIG_SND_DEBUG_DETECT
+#define snd_printdd snd_printk
+#else
+#define snd_printdd 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#endif
+
+#else /* !TARGET_OS2 */
+
+#ifdef CONFIG_SND_VERBOSE_PRINTK
 #define snd_printk(format, args...) do { \
         printk(snd_verbose_printk(__FILE__, __LINE__, format) ? format + 3 : format, ##args); \
@@ -372 +409 @@
 #endif
 
+#endif /* TARGET_OS2 */
+
 static inline void snd_timestamp_now(struct timespec *tstamp, int timespec)
 {