gcrypt: use vlc_global_mutex

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 739994704c35dfe2dae4bf8c09b60cedafc069e7..eb957ca1406632d578067fce7633cc0b5cc754f9 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -120,8 +120,8 @@ enum vlc_module_properties
 /**
  * Current plugin ABI version
  */
-# define MODULE_SYMBOL 1_1_0g
-# define MODULE_SUFFIX "__1_1_0g"
+# define MODULE_SYMBOL 1_2_0a
+# define MODULE_SUFFIX "__1_2_0a"
 
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
@@ -226,7 +226,7 @@ enum vlc_module_properties
      || vlc_module_set (p_submodule, VLC_MODULE_CB_CLOSE, deactivate)) \
         goto error;
 
-#define linked_with_a_crap_library_which_uses_atexit( ) \
+#define cannot_unload_broken_library( ) \
     if (vlc_module_set (p_submodule, VLC_MODULE_NO_UNLOAD)) \
         goto error;
 
@@ -417,16 +417,19 @@ enum vlc_module_properties
     vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
                     (vlc_callback_t)(pf_action), (const char *)(text));
 
-#define change_internal() \
-    vlc_config_set (p_config, VLC_CONFIG_PRIVATE);
-
 #define change_need_restart() \
     vlc_config_set (p_config, VLC_CONFIG_RESTART);
 
 #define change_autosave() \
     vlc_config_set (p_config, VLC_CONFIG_PERSISTENT);
 
-#define change_unsaveable() \
+/* For options that are saved but hidden from the preferences panel */
+#define change_private() \
+    vlc_config_set (p_config, VLC_CONFIG_PRIVATE);
+
+/* For options that cannot be saved in the configuration */
+#define change_volatile() \
+    change_private() \
     vlc_config_set (p_config, VLC_CONFIG_VOLATILE);
 
 #define change_safe() \