libvlccore: Rename iso_lang.h to vlc_iso_lang.h because we use VLC_EXPORT there,...

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 6b6ccae55254eeb7112d8a2a3987a947704ae787..cf632ee5b50c9d510bbc283f8e41964c9ee99610 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -43,7 +43,7 @@
 
 /* Explanation:
  *
- * if HAVE_DYNAMIC_PLUGINS is NOT set, we will need:
+ * if linking a module statically, we will need:
  * #define MODULE_FUNC( zog ) module_foo_zog
  *
  * this can't easily be done with the C preprocessor, thus a few ugly hacks.
@@ -66,9 +66,6 @@
 #if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
 #   define DLL_SYMBOL              __declspec(dllexport)
 #   define CDECL_SYMBOL            __cdecl
-#elif defined (HAVE_ATTRIBUTE_VISIBILITY)
-#   define DLL_SYMBOL __attribute__((visibility("default")))
-#   define CDECL_SYMBOL
 #else
 #   define DLL_SYMBOL
 #   define CDECL_SYMBOL
@@ -122,7 +119,8 @@ E_(vlc_entry) ( module_t *p_module );
         goto error
 
 #define add_shortcut( shortcut ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_SHORTCUT, (int)(shortcut))) \
+    if (vlc_module_set (p_submodule, VLC_MODULE_SHORTCUT, \
+        (const char *)(shortcut))) \
         goto error
 
 #define set_shortname( shortname ) \
@@ -140,7 +138,8 @@ E_(vlc_entry) ( module_t *p_module );
         goto error
 
 #define set_capability( cap, score ) \
-    if (vlc_module_set (p_submodule, VLC_MODULE_CAPABILITY, (int)(cap)) \
+    if (vlc_module_set (p_submodule, VLC_MODULE_CAPABILITY, \
+                        (const char *)(cap)) \
      || vlc_module_set (p_submodule, VLC_MODULE_SCORE, (int)(score))) \
         goto error