Declare extern vlc_symbol_... explicitly

diff --git a/include/modules_inner.h b/include/modules_inner.h
index 6d1f554663927a97ad47192c80914a272f0200f9..75e9699bdde850c46e923bd660844d098837a8f8 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -92,6 +92,11 @@
  * instance the module name, its shortcuts, its capabilities... we also create
  * a copy of its config because the module can be unloaded at any time.
  */
+#if defined (__PLUGIN__) || defined (__BUILTIN__)
+EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL
+E_(vlc_entry) ( module_t *p_module );
+#endif
+
 #define vlc_module_begin( )                                                   \
     DECLARE_SYMBOLS;                                                          \
     EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 5edb253f24895419e2505292418f3a69f64b444f..71162e40e2534e51b1e2b68210c92f53d96a8f05 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -58,7 +58,6 @@
 #endif
 
 #include "vlc_config.h"
-#include "modules_inner.h"
 
 /*****************************************************************************
  * Required system headers
@@ -460,6 +459,9 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 /*****************************************************************************
  * Plug-in stuff
  *****************************************************************************/
+
+#include "modules_inner.h"
+
 #if !defined (__PLUGIN__) || defined (HAVE_SHARED_LIBVLC)
 #   ifdef __cplusplus
 #      define VLC_EXPORT( type, name, args ) extern "C" type name args