X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_modules_macros.h;h=88ee156044dc81c09034b0aa7e747a3317badafe;hb=bb5a8eb81e72432957f7dc0de32a9ae440884f62;hp=de8f8e26d390e3fece4811234fad1242cbcdc0c8;hpb=e684b424fbd7cea2f9780a518624b64368f372ef;p=vlc

diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h
index de8f8e26d3..88ee156044 100644
--- a/include/vlc_modules_macros.h
+++ b/include/vlc_modules_macros.h
@@ -35,7 +35,8 @@
 /**
  * Current plugin ABI version
  */
-# define MODULE_SUFFIX __0_9_0e
+# 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.
@@ -72,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
@@ -109,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)))                         \
@@ -120,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;                                                  \
     }                                                                         \