XML reader: use VLC object and plugin infrastructures

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 38ad6fce21efd9a9dee16e4e564764e93038f9f3..20dfbc9e8fbeac4243d67ae4dfbfe74010e414bd 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -409,7 +409,7 @@ struct stat;
  */
 typedef union
 {
-    int             i_int;
+    int64_t         i_int;
     bool            b_bool;
     float           f_float;
     char *          psz_string;
@@ -833,7 +833,7 @@ static inline uint64_t ntoh64 (uint64_t ll)
 
 VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
 
-VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) );
+VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) LIBVLC_USED );
 
 /* iconv wrappers (defined in src/extras/libc.c) */
 typedef void *vlc_iconv_t;
@@ -902,7 +902,6 @@ VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
 #include "vlc_messages.h"
 #include "vlc_objects.h"
 #include "vlc_variables.h"
-#include "vlc_modules.h"
 #include "vlc_main.h"
 #include "vlc_configuration.h"