X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_modules_macros.h;h=88ee156044dc81c09034b0aa7e747a3317badafe;hb=7179862ee5ec72a7d85a9ceb8ef818f609108704;hp=6bb7dd1ec35615b420ad37485892d96b58bcb560;hpb=9f279d647f30a3c161d8f9fe32619ee47b09ef56;p=vlc

diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h
index 6bb7dd1ec3..88ee156044 100644
--- a/include/vlc_modules_macros.h
+++ b/include/vlc_modules_macros.h
@@ -32,6 +32,12 @@
 #   define MODULE_NAME main
 #endif
 
+/**
+ * Current plugin ABI version
+ */
+# define MODULE_SYMBOL 0_9_0j
+# define MODULE_SUFFIX "__0_9_0j"
+
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
  *****************************************************************************/
@@ -67,7 +73,7 @@
 #if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
 #   define DLL_SYMBOL              __declspec(dllexport)
 #   define CDECL_SYMBOL            __cdecl
-#elif HAVE_ATTRIBUTE_VISIBILITY
+#elif defined (HAVE_ATTRIBUTE_VISIBILITY)
 #   define DLL_SYMBOL __attribute__((visibility("default")))
 #   define CDECL_SYMBOL
 #else
@@ -104,8 +110,6 @@ E_(vlc_entry) ( module_t *p_module );
     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;                                     \
         if (vlc_module_set (p_module, VLC_MODULE_NAME,                        \
                             (void *)(MODULE_STRING)))                         \
@@ -115,23 +119,11 @@ E_(vlc_entry) ( module_t *p_module );
 
 #define vlc_module_end( )                                                     \
         }                                                                     \
-        res = config_Duplicate( p_module, p_config, ++i_config );             \
-        for( size_t i = 0; i < i_config; i++ )                                \
-        {                                                                     \
-            if( p_config[ i ].i_action )                                      \
-            {                                                                 \
-                free( p_config[ i ].ppf_action );                             \
-                free( p_config[ i ].ppsz_action_text );                       \
-            }                                                                 \
-        }                                                                     \
-        free( p_config );                                                     \
-        if (res)                                                              \
-            return res;                                                       \
-        (void)i_shortcut;                                                     \
+        (void)p_config;                                                       \
         return VLC_SUCCESS;                                                   \
                                                                               \
     error:                                                                    \
-        free( p_config );                                                     \
+        /* FIXME: config_Free( p_module ); */                                 \
         /* FIXME: cleanup submodules objects ??? */                           \
         return VLC_EGENERIC;                                                  \
     }                                                                         \
@@ -167,10 +159,6 @@ E_(vlc_entry) ( module_t *p_module );
                         (void *)(intptr_t)(score))) \
         goto error
 
-#define set_program( program ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_PROGRAM, (void *)(program))) \
-        goto error
-
 #define set_callbacks( activate, deactivate ) \
     if (vlc_module_set (p_submodule, VLC_MODULE_CB_OPEN, (void *)(activate)) \
      || vlc_module_set (p_submodule, VLC_MODULE_CB_CLOSE, \