Penultimate (initial) public header fix

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 3c937967347fc81ed4caf4ac03c5c236e79348bd..ae76d171fd48fc06c5a6d7461231a445d3493722 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -684,13 +684,6 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
 #   define LIBVLC_FORMAT(x,y)
 #endif
 
-/* Alignment of critical static data structures */
-#ifdef ATTRIBUTE_ALIGNED_MAX
-#   define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
-#else
-#   define ATTR_ALIGN(align)
-#endif
-
 /* */
 #define VLC_UNUSED(x) (void)(x)
 

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 790dc36c612e9135c21fef8ebf4ac9ab30682ce3..f72ee528d065ace1e7d4f3fe9908e5da01cfc79a 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -204,6 +204,13 @@ static inline struct tm *gmtime_r (const time_t *timep, struct tm *result)
 }
 #endif
 
+/* Alignment of critical static data structures */
+#ifdef ATTRIBUTE_ALIGNED_MAX
+#   define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
+#else
+#   define ATTR_ALIGN(align)
+#endif
+
 #ifndef HAVE_USELOCALE
 typedef void *locale_t;
 # define newlocale( a, b, c ) ((locale_t)0)