Ignore:
Timestamp:
Feb 24, 2008, 8:18:08 PM (18 years ago)
Author:
Brendan Oakley
Message:

Merged to ALSA 1.0.3

Location:
GPL/branches/alsa-resync1/alsa-kernel/include/sound
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

    r299 r300  
    195195#define vsnprintf(buf,size,fmt,args) snd_compat_vsnprintf(buf,size,fmt,args)
    196196#endif
     197
     198#ifndef TARGET_OS2
     199#ifndef CONFIG_HAVE_SCNPRINTF
     200#define scnprintf(buf,size,fmt,args...) snprintf(buf,size,fmt,##args)
     201#define vscnprintf(buf,size,fmt,args) vsnprintf(buf,size,fmt,args)
     202#endif
     203#endif /* !TARGET_OS2 */
    197204
    198205#if defined(__alpha__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 14)

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm_oss.h

    r281 r300  
    5151        unsigned int subdivision;               /* requested subdivision */
    5252        size_t period_bytes;                    /* requested period size */
     53        size_t period_frames;                   /* period frames for poll */
    5354        size_t period_ptr;                      /* actual write pointer to period */
    5455        unsigned int periods;

  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/version.h

    r290 r300  
    11/* include/version.h.  Generated by configure.  */
    2 #define CONFIG_SND_VERSION "1.0.2"
     2#define CONFIG_SND_VERSION "1.0.3"
    33#define CONFIG_SND_DATE ""
Note: See TracChangeset for help on using the changeset viewer.