From 7feea9d3aa7525953a985ebfd7eb688dd3fdab0f Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 6 Jan 2010 22:27:38 +0200
Subject: [PATCH] Remove unused modules_t.b_reentrant

---
 src/modules/cache.c   | 6 +-----
 src/modules/entry.c   | 1 -
 src/modules/modules.h | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 4f3c34f8ef..74d12589f4 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -84,7 +84,7 @@ static int    CacheSaveConfig  ( module_t *, FILE * );
 
 /* Sub-version number
  * (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 5
+#define CACHE_SUBVERSION_NUM 6
 
 /* Format string for the cache filename */
 #define CACHENAME_FORMAT \
@@ -286,7 +286,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
         LOAD_IMMEDIATE( pp_cache[i]->p_module->i_score );
         LOAD_IMMEDIATE( pp_cache[i]->p_module->i_cpu );
         LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
-        LOAD_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
         LOAD_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
 
         /* Config stuff */
@@ -313,7 +312,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
             LOAD_IMMEDIATE( p_module->i_score );
             LOAD_IMMEDIATE( p_module->i_cpu );
             LOAD_IMMEDIATE( p_module->b_unloadable );
-            LOAD_IMMEDIATE( p_module->b_reentrant );
         }
     }
 
@@ -566,7 +564,6 @@ void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
         SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score );
         SAVE_IMMEDIATE( pp_cache[i]->p_module->i_cpu );
         SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
-        SAVE_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
         SAVE_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
 
         /* Config stuff */
@@ -626,7 +623,6 @@ static int CacheSaveSubmodule( FILE *file, module_t *p_module )
     SAVE_IMMEDIATE( p_module->i_score );
     SAVE_IMMEDIATE( p_module->i_cpu );
     SAVE_IMMEDIATE( p_module->b_unloadable );
-    SAVE_IMMEDIATE( p_module->b_reentrant );
     return 0;
 
 error:
diff --git a/src/modules/entry.c b/src/modules/entry.c
index a3679f17f7..68dff9f0e5 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -67,7 +67,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
     module->i_score = 1;
     module->i_cpu = 0;
     module->b_unloadable = true;
-    module->b_reentrant = true;
     module->b_submodule = false;
     module->pf_activate = NULL;
     module->pf_deactivate = NULL;
diff --git a/src/modules/modules.h b/src/modules/modules.h
index e1dfa2e0c3..830cb9c9db 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -119,7 +119,6 @@ struct module_t
     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 */
-- 
2.39.2