diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-12 09:35:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-12 09:35:05 +0100 |
| commit | a55ce0c348cd16e7853dae11e8e0e1b5a101d884 (patch) | |
| tree | 4c96cc68912d5a524b8e71ac1f1dcac6e2b3c569 | |
| parent | ddd58c76efc37c8dc17d7b55d58d54b45aa60d55 (diff) | |
| download | salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884.tar.gz | |
Shuffle the inclusion of version.h
Instead of including global.h from version.h, shuffle the inclusion
order in asondlib.h. Also add an ifdef guard in version.h just to be
sure.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | src/asoundlib-head.h | 2 | ||||
| -rw-r--r-- | src/version.h.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/asoundlib-head.h b/src/asoundlib-head.h index f72518f..a852fbe 100644 --- a/src/asoundlib-head.h +++ b/src/asoundlib-head.h @@ -39,8 +39,8 @@ extern "C" { #include "recipe.h" #include "asoundef.h" -#include "version.h" #include "global.h" +#include "version.h" #include "input.h" #include "output.h" #include "error.h" diff --git a/src/version.h.in b/src/version.h.in index 8d031b8..ef13d06 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,8 +1,6 @@ #ifndef __ALSA_VERSION_H #define __ALSA_VERSION_H -#include "global.h" - #define SND_LIB_MAJOR @SND_LIB_MAJOR@ #define SND_LIB_MINOR @SND_LIB_MINOR@ #define SND_LIB_SUBMINOR @SND_LIB_SUBMINOR@ @@ -14,10 +12,12 @@ /* library version (string) */ #define SND_LIB_VERSION_STR "@SND_LIB_VERSION@" +#ifdef __SALSA_EXPORT_FUNC __SALSA_EXPORT_FUNC const char *snd_asoundlib_version(void) { return SND_LIB_VERSION_STR; } +#endif /* __SALSA_EXPORT_FUNC */ #endif /* __ALSA_VERSION_H */ |