iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALSA] Clean up includes in asound.h & asequencer.h

Browse Source 
Modules: ALSA sequencer,ALSA Core

Clean up includes in asound.h and asequencer.h.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2005-11-17 10:29:33 +01:00 committed by Jaroslav Kysela
parent bc1ff7fc0a
commit 6560c349c5
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/asequencer.h
View File

@ -22,11 +22,10 @@
#ifndef __SOUND_ASEQUENCER_H #ifndef __SOUND_ASEQUENCER_H
#define __SOUND_ASEQUENCER_H #define __SOUND_ASEQUENCER_H
#ifndef __KERNEL__ #ifdef __KERNEL__
#include <linux/ioctl.h> #include <linux/ioctl.h>
#endif
#include <sound/asound.h> #include <sound/asound.h>
#endif
/** version of the sequencer */ /** version of the sequencer */
#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) #define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1)

26
include/sound/asound.h
View File

@ -23,12 +23,8 @@
#ifndef __SOUND_ASOUND_H #ifndef __SOUND_ASOUND_H
#define __SOUND_ASOUND_H #define __SOUND_ASOUND_H
#if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
#include <linux/ioctl.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
@ -43,25 +39,7 @@
#endif #endif
#endif #endif
#else /* !__KERNEL__ */ #endif /* __KERNEL__ **/
#include <endian.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define SNDRV_LITTLE_ENDIAN
#elif __BYTE_ORDER == __BIG_ENDIAN
#define SNDRV_BIG_ENDIAN
#else
#error "Unsupported endian..."
#endif
#endif /* __KERNEL **/
#endif /* LINUX */
#ifndef __KERNEL__
#include <sys/time.h>
#include <sys/types.h>
#endif
/* /*
* protocol version * protocol version