Remove always false b_junk cache entry property

[vlc] / src / modules / modules.h

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 84ee02c1317cdf69dd960caec09b5116b8dfe0cf..d4600c4fd14222882807ab404ace9623f8cb59f0 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -41,9 +41,6 @@ struct module_bank_t
 {
     unsigned         i_usage;
 
-    bool             b_builtins;
-    bool             b_plugins;
-
     /* Plugins cache */
     bool             b_cache;
     bool             b_cache_dirty;
@@ -66,18 +63,17 @@ struct module_cache_t
     char       *psz_file;
     int64_t    i_time;
     int64_t    i_size;
-    bool b_junk;
 
     /* Optional extra data */
-    module_t *p_module;
     bool b_used;
+    module_t *p_module;
 };
 
 
 #define MODULE_SHORTCUT_MAX 50
 
 /* The module handle type. */
-#if defined(HAVE_DL_DYLD)
+#if defined(HAVE_DL_DYLD) && !defined(__x86_64__)
 #   if defined (HAVE_MACH_O_DYLD_H)
 #       include <mach-o/dyld.h>
 #   endif
@@ -103,7 +99,6 @@ struct module_t
     module_t   *parent;
     unsigned    submodule_count;
     gc_object_t vlc_gc_data;
-    vlc_mutex_t lock;
 
     /*
      * Variables set by the module to identify itself
@@ -117,10 +112,8 @@ struct module_t
 
     char    *psz_capability;                                 /**< Capability */
     int      i_score;                          /**< Score for the capability */
-    uint32_t i_cpu;                           /**< Required CPU capabilities */
 
     bool b_unloadable;                        /**< Can we be dlclosed? */
-    bool b_reentrant;                           /**< Are we reentrant? */
     bool b_submodule;                        /**< Is this a submodule? */
 
     /* Callbacks */
@@ -153,8 +146,8 @@ module_t *vlc_submodule_create (module_t *module);
 void  __module_InitBank        ( vlc_object_t * );
 void module_LoadPlugins( vlc_object_t *, bool );
 #define module_LoadPlugins(a,b) module_LoadPlugins(VLC_OBJECT(a),b)
-#define module_EndBank(a)      __module_EndBank(VLC_OBJECT(a))
-void  __module_EndBank         ( vlc_object_t * );
+void module_EndBank( vlc_object_t *, bool );
+#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
 
 /* Low-level OS-dependent handler */
 int  module_Load   (vlc_object_t *, const char *, module_handle_t *);