Changeset 99


Ignore:
Timestamp:
May 8, 2007, 3:31:55 AM (13 years ago)
Author:
Brendan Oakley
Message:

Fixed a merge mistake in core.h

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

    r95 r99  
    322322/* --- */
    323323
     324#ifdef TARGET_OS2
     325
     326#define snd_printk printk
     327
     328#ifdef CONFIG_SND_DEBUG
     329
     330#define snd_printd snd_printk
     331#define snd_assert(expr, retval) \
     332        if (!(expr)) {\
     333                snd_printk("BUG? (%s)\n", __STRING(expr));\
     334                ##retval;\
     335        }
     336
     337#define snd_runtime_check snd_assert
     338#define snd_runtime_check_continue snd_assert_continue
     339
     340
     341#else /* !CONFIG_SND_DEBUG */
     342
     343#define snd_printd  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
     344#define snd_assert(expr, retval) \
     345        if (!(expr)) {\
     346                ##retval;\
     347        }
     348#define snd_runtime_check snd_assert
     349
     350#endif /* CONFIG_SND_DEBUG */
     351
     352#ifdef CONFIG_SND_DEBUG_DETECT
     353#define snd_printdd snd_printk
     354#else
     355#define snd_printdd 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
     356#endif
     357
     358#else /* !TARGET_OS2 */
     359
     360#ifdef CONFIG_SND_VERBOSE_PRINTK
    324361#define snd_printk(format, args...) do { \
    325362        printk(snd_verbose_printk(__FILE__, __LINE__, format) ? format + 3 : format, ##args); \
     
    372409#endif
    373410
     411#endif /* TARGET_OS2 */
     412
    374413static inline void snd_timestamp_now(struct timespec *tstamp, int timespec)
    375414{
Note: See TracChangeset for help on using the changeset viewer.