diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-29 10:33:46 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-29 10:33:46 +0300 |
| commit | a4fa2fc3810613c3bd6016e092ae69a367a19ad5 (patch) | |
| tree | f86b9751457886a376978fd5f9f1d387fbe847a2 | |
| parent | ba90c7eb0ab1e068a06b28d40f4e0fc0a538873b (diff) | |
| parent | d87b927b699093e48447920d460560fe7e144047 (diff) | |
| download | xine-lib-a4fa2fc3810613c3bd6016e092ae69a367a19ad5.tar.gz xine-lib-a4fa2fc3810613c3bd6016e092ae69a367a19ad5.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/xine-utils/attributes.h => include/xine/attributes.h
| -rw-r--r-- | include/xine/attributes.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/xine/attributes.h b/include/xine/attributes.h index 544228664..3c8404df3 100644 --- a/include/xine/attributes.h +++ b/include/xine/attributes.h @@ -26,12 +26,6 @@ #ifndef ATTRIBUTE_H_ #define ATTRIBUTE_H_ -#ifdef ATTRIBUTE_ALIGNED_MAX -#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) -#else -#define ATTR_ALIGN(align) -#endif - #ifdef XINE_COMPILE # include "configure.h" #else @@ -57,6 +51,13 @@ # endif #endif + +#ifdef ATTRIBUTE_ALIGNED_MAX +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) +#else +#define ATTR_ALIGN(align) +#endif + /* Export protected only for libxine functions */ #if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED) # define XINE_PROTECTED __attribute__((__visibility__("protected"))) |