Same as previous commit

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 23b6b5613804e17bfce30ea2075942ae3bdcbd5a..8ef6ff2dd769924672358f39ac19191e21d9f6ce 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -484,37 +484,29 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #    define VLC_INTERNAL( type, name, args ) type name args
 #  endif
 #else
-#  if !defined (__PLUGIN__) || defined (HAVE_SHARED_LIBVLC)
-#    ifdef __cplusplus
-#      if HAVE_ATTRIBUTE_VISIBILITY
-#         define VLC_PUBLIC_API __attribute__((visibility("default")))
-#         define VLC_PRIVATE_API __attribute__((visibility("default")))
-#         define   VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
-#         define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
-#      else
-#         define VLC_PUBLIC_API
-#         define   VLC_EXPORT( type, name, args ) extern "C" type name args
-#         define VLC_INTERNAL( type, name, args ) extern "C" type name args
-#      endif
+#  ifdef __cplusplus
+#    if HAVE_ATTRIBUTE_VISIBILITY
+#      define VLC_PUBLIC_API __attribute__((visibility("default")))
+#      define VLC_PRIVATE_API __attribute__((visibility("default")))
+#      define   VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
+#      define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
 #    else
-#      if HAVE_ATTRIBUTE_VISIBILITY
-#         define VLC_PUBLIC_API extern __attribute__((visibility("default")))
-#         define VLC_PRIVATE_API extern __attribute__((visibility("default")))
-#         define   VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
-#         define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
-#      else
-#         define VLC_PUBLIC_API extern 
-#         define VLC_PRIVATE_API extern
-#         define   VLC_EXPORT( type, name, args ) type name args
-#         define VLC_INTERNAL( type, name, args ) type name args
-#      endif
+#      define VLC_PUBLIC_API
+#      define   VLC_EXPORT( type, name, args ) extern "C" type name args
+#      define VLC_INTERNAL( type, name, args ) extern "C" type name args
 #    endif
 #  else
-#    define VLC_PUBLIC_API 
-#    define VLC_PRIVATE_API 
-#    define   VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
-#    define VLC_INTERNAL( type, name, args ) struct _u_n_u_s_e_d_
-     extern module_symbols_t* p_symbols;
+#    if HAVE_ATTRIBUTE_VISIBILITY
+#      define VLC_PUBLIC_API extern __attribute__((visibility("default")))
+#      define VLC_PRIVATE_API extern __attribute__((visibility("default")))
+#      define   VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
+#      define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
+#    else
+#      define VLC_PUBLIC_API extern 
+#      define VLC_PRIVATE_API extern
+#      define   VLC_EXPORT( type, name, args ) type name args
+#      define VLC_INTERNAL( type, name, args ) type name args
+#    endif
 #  endif
 #endif
 
@@ -1180,7 +1172,7 @@ VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
-#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
+#ifdef WIN32
 VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #endif
 
@@ -1196,7 +1188,7 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #       include <libintl.h>
 #   endif
 #   undef _
-#   if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC)
+#   ifdef WIN32
 #       define _(String) vlc_dgettext (PACKAGE_NAME, String)
 #   else
 #       define _(String) dgettext(PACKAGE_NAME, String)

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index c8c1acd265052c68cb4f7f0883b61b23fb7c19e4..95f432494cd60a28f9dc55b62596a2d6c26ba77a 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -94,11 +94,6 @@ struct module_t
 
     vlc_bool_t          b_builtin;  /* Set to true if the module is built in */
     vlc_bool_t          b_loaded;        /* Set to true if the dll is loaded */
-
-#ifndef HAVE_SHARED_LIBVLC
-    /* Legacy symbols table */
-    module_symbols_t *p_symbols;
-#endif
 };
 
 /*****************************************************************************

diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h
index bc5f4dd2f05d4eeb24e0cbbe27c33050bd8e159b..0f46a1d3f8671ac1ff95dc6b542c67240c8a4b71 100644 (file)
--- a/include/vlc_modules_macros.h
+++ b/include/vlc_modules_macros.h
@@ -64,14 +64,6 @@
 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
 #endif
 
-#if defined( __BUILTIN__ ) || defined( HAVE_SHARED_LIBVLC )
-#   define DECLARE_SYMBOLS         struct _u_n_u_s_e_d_
-#   define STORE_SYMBOLS           struct _u_n_u_s_e_d_
-#else
-#   define DECLARE_SYMBOLS         module_symbols_t* p_symbols = NULL
-#   define STORE_SYMBOLS           p_symbols = p_module->p_symbols
-#endif
-
 #if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
 #   define DLL_SYMBOL              __declspec(dllexport)
 #   define CDECL_SYMBOL            __cdecl
@@ -109,14 +101,12 @@ E_(vlc_entry) ( module_t *p_module );
 #endif
 
 #define vlc_module_begin( )                                                   \
-    DECLARE_SYMBOLS;                                                          \
     EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \
     __VLC_SYMBOL(vlc_entry) ( module_t *p_module )                            \
     {                                                                         \
         int i_shortcut = 1, res;                                              \
         size_t i_config = (size_t)(-1);                                       \
         module_config_t *p_config = NULL;                                     \
-        STORE_SYMBOLS;                                                        \
         if (vlc_module_set (p_module, VLC_MODULE_NAME,                        \
                             (void *)(MODULE_STRING)))                         \
             goto error;                                                       \