httpd: Fix keepalive/close of non-matching HTTP versions.

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index f0d2554562ecbb4b15a76776a44664f5c0cf25c2..5ed2297ebaf6d0ed41e21c5e2d8bf1bc74681554 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -24,6 +24,11 @@
 #ifndef LIBVLC_MODULES_MACROS_H
 # define LIBVLC_MODULES_MACROS_H 1
 
+/**
+ * \file
+ * This file implements plugin (module) macros used to define a vlc module.
+ */
+
 /*****************************************************************************
  * If we are not within a module, assume we're in the vlc core.
  *****************************************************************************/
@@ -34,8 +39,8 @@
 /**
  * Current plugin ABI version
  */
-# define MODULE_SYMBOL 0_9_0m
-# define MODULE_SUFFIX "__0_9_0m"
+# define MODULE_SYMBOL 1_0_0c
+# define MODULE_SUFFIX "__1_0_0c"
 
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
@@ -56,10 +61,8 @@
 /* If the module is built-in, then we need to define foo_InitModule instead
  * of InitModule. Same for Activate- and DeactivateModule. */
 #ifdef __PLUGIN__
-#   define E_( function )          CONCATENATE( function, MODULE_SYMBOL )
 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
 #else
-#   define E_( function )          CONCATENATE( function, MODULE_NAME )
 #   define __VLC_SYMBOL( symbol )  CONCATENATE( symbol, MODULE_NAME )
 #endif
 
@@ -85,7 +88,7 @@
  */
 #define vlc_module_begin( )                                                   \
     EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \
-    E_(vlc_entry) ( module_t *p_module );                                     \
+    __VLC_SYMBOL(vlc_entry) ( module_t *p_module );                           \
                                                                               \
     EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL                                 \
     __VLC_SYMBOL(vlc_entry) ( module_t *p_module )                            \
@@ -403,21 +406,21 @@ enum vlc_config_properties
                     (size_t)(sizeof (list) / sizeof (char *)), \
                     (const char *const *)(list), \
                     (const char *const *)(list_text), \
-                    list_update_func);
+                    (vlc_callback_t)(list_update_func));
 
 #define change_integer_list( list, list_text, list_update_func ) \
     vlc_config_set (p_config, VLC_CONFIG_LIST, domain, \
                     (size_t)(sizeof (list) / sizeof (int)), \
                     (const int *)(list), \
                     (const char *const *)(list_text), \
-                    list_update_func);
+                    (vlc_callback_t)(list_update_func));
 
 #define change_float_list( list, list_text, list_update_func ) \
     vlc_config_set (p_config, VLC_CONFIG_LIST, domain, \
                     (size_t)(sizeof (list) / sizeof (float)), \
                     (const float *)(list), \
                     (const char *const *)(list_text), \
-                    list_update_func);
+                    (vlc_callback_t)(list_update_func));
 
 #define change_integer_range( minv, maxv ) \
     vlc_config_set (p_config, VLC_CONFIG_RANGE, (int)(minv), (int)(maxv));
@@ -442,15 +445,13 @@ enum vlc_config_properties
 #define change_unsaveable() \
     vlc_config_set (p_config, VLC_CONFIG_VOLATILE);
 
-#define change_unsafe() (void)0; /* no-op */
-
 #define change_safe() \
     vlc_config_set (p_config, VLC_CONFIG_SAFE);
 
 /* Meta data plugin exports */
 #define VLC_META_EXPORT( name, value ) \
     EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
-    E_(vlc_entry_ ## name) (void); \
+    __VLC_SYMBOL(vlc_entry_ ## name) (void); \
     EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
     __VLC_SYMBOL(vlc_entry_ ## name) (void) \
     { \