qt4: fix the use of HTTP in open dialog

[vlc] / include / vlc_modules_macros.h

diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h
index a267358801234c76ecd0435d718bcc43ab491a9b..6bb7dd1ec35615b420ad37485892d96b58bcb560 100644 (file)
--- a/include/vlc_modules_macros.h
+++ b/include/vlc_modules_macros.h
@@ -56,7 +56,7 @@
 
 /* If the module is built-in, then we need to define foo_InitModule instead
  * of InitModule. Same for Activate- and DeactivateModule. */
-#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (__LIBVLC__)
+#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 #   define E_( function )          CONCATENATE( function, MODULE_SYMBOL )
 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
 #else
@@ -143,7 +143,7 @@ E_(vlc_entry) ( module_t *p_module );
 
 #define add_requirement( cap ) \
     if (vlc_module_set (p_module, VLC_MODULE_CPU_REQUIREMENT, \
-                        (void *)(CPU_CAPABILITY_##cap))) goto error
+                        (void *)(intptr_t)(CPU_CAPABILITY_##cap))) goto error
 
 #define add_shortcut( shortcut ) \
     if (vlc_module_set (p_submodule, VLC_MODULE_SHORTCUT, (void*)(shortcut))) \
@@ -163,7 +163,8 @@ E_(vlc_entry) ( module_t *p_module );
 
 #define set_capability( cap, score ) \
     if (vlc_module_set (p_submodule, VLC_MODULE_CAPABILITY, (void *)(cap)) \
-     || vlc_module_set (p_submodule, VLC_MODULE_SCORE, (void *)(score))) \
+     || vlc_module_set (p_submodule, VLC_MODULE_SCORE, \
+                        (void *)(intptr_t)(score))) \
         goto error
 
 #define set_program( program ) \