Cosmetic

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index 9f3cd514bdfef4ee82b85f9900fe22f909493d69..68ced4dd0b4100ff7867abfd13e11173ad28a684 100644 (file)
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -25,6 +25,8 @@
   #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
 
+#if 1
+/* FIXME: scheduled for privatization */
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
@@ -46,8 +48,6 @@ typedef shl_t module_handle_t;
 /**
  * Module descriptor
  */
-#ifndef __PLUGIN__FIXME___
-/* FIXME: scheduled for privatization */
 struct module_t
 {
     VLC_COMMON_MEMBERS

diff --git a/src/modules/modules.h b/src/modules/modules.h
index d0654d694abc6c2f20eb0cfb849d7b160cf86478..7b235593af5cce29855c8a1172f0f34cd0eea270 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -109,15 +109,10 @@ struct module_t
     const char *psz_longname;                   /**< Module descriptive name */
     const char *psz_help;        /**< Long help string for "special" modules */
 
-    /*
-     * Variables set by the module to tell us what it can do
-     */
-    const char *psz_program; /**< Program name which will activate the module */
-
     /** Shortcuts to the module */
     const char *pp_shortcuts[ MODULE_SHORTCUT_MAX ];
 
-    const char    *psz_capability;                           /**< Capability */
+    char    *psz_capability;                                 /**< Capability */
     int      i_score;                          /**< Score for the capability */
     uint32_t i_cpu;                           /**< Required CPU capabilities */