Remove unused variable.

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index ffcc0f5dd5abc25cedb10ccb15554785be36fa2c..f0d2554562ecbb4b15a76776a44664f5c0cf25c2 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -34,8 +34,8 @@
 /**
  * Current plugin ABI version
  */
-# define MODULE_SYMBOL 0_9_0k
-# define MODULE_SUFFIX "__0_9_0k"
+# define MODULE_SYMBOL 0_9_0m
+# define MODULE_SUFFIX "__0_9_0m"
 
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
@@ -83,13 +83,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( )                                                   \
     EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \
+    E_(vlc_entry) ( module_t *p_module );                                     \
+                                                                              \
+    EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \
     __VLC_SYMBOL(vlc_entry) ( module_t *p_module )                            \
     {                                                                         \
         module_config_t *p_config = NULL;                                     \
@@ -451,20 +449,29 @@ enum vlc_config_properties
 
 /* Meta data plugin exports */
 #define VLC_META_EXPORT( name, value ) \
-    EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \
+    EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
+    E_(vlc_entry_ ## name) (void); \
+    EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
     __VLC_SYMBOL(vlc_entry_ ## name) (void) \
     { \
          return value; \
     }
 
 #if defined (__LIBVLC__)
-# define VLC_COPYRIGHT_EXPORT VLC_META_EXPORT (copyright, COPYRIGHT_MESSAGE)
+# define VLC_COPYRIGHT_EXPORT VLC_META_EXPORT (copyright, \
+    "\x43\x6f\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x74\x68" \
+    "\x65\x20\x56\x69\x64\x65\x6f\x4c\x41\x4e\x20\x56\x4c\x43\x20\x6d" \
+    "\x65\x64\x69\x61\x20\x70\x6c\x61\x79\x65\x72\x20\x64\x65\x76\x65" \
+    "\x6c\x6f\x70\x70\x65\x72\x73" )
 #elif !defined (VLC_COPYRIGHT_EXPORT)
 # define VLC_COPYRIGHT_EXPORT
 #endif
 #define VLC_LICENSE_EXPORT VLC_META_EXPORT (license, \
-    "Licensed under the terms of the GNU General Public License, " \
-    "version 2 or later.")
+    "\x4c\x69\x63\x65\x6e\x73\x65\x64\x20\x75\x6e\x64\x65\x72\x20\x74" \
+    "\x68\x65\x20\x74\x65\x72\x6d\x73\x20\x6f\x66\x20\x74\x68\x65\x20" \
+    "\x47\x4e\x55\x20\x47\x65\x6e\x65\x72\x61\x6c\x20\x50\x75\x62\x6c" \
+    "\x69\x63\x20\x4c\x69\x63\x65\x6e\x73\x65\x2c\x20\x76\x65\x72\x73" \
+    "\x69\x6f\x6e\x20\x32\x20\x6f\x72\x20\x6c\x61\x74\x65\x72\x2e" )
 
 #define VLC_METADATA_EXPORTS \
     VLC_COPYRIGHT_EXPORT \