[vlc-devel] commit: Merge E_ and __VLC_SYMBOL ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Sep 21 19:15:42 2008 +0300| [a47c9f2f1ed05ce552032639bf3bfa02d47a9012] | committer: Rémi Denis-Courmont 

Merge E_ and __VLC_SYMBOL

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a47c9f2f1ed05ce552032639bf3bfa02d47a9012
---

 include/vlc_plugin.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 57dc998..b98cfd4 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -61,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
 
@@ -90,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 )                            \
@@ -455,7 +453,7 @@ enum vlc_config_properties
 /* 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) \
     { \