[vlc-commits] lua: reserved identifier in function names

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Mon Feb 22 01:12:49 2016 +0100| [31ea5368985419d71870be9782d7dba636f9fc14] | committer: Jean-Baptiste Kempf

lua: reserved identifier in function names

  * renamed `__PushCommand` to `PushCommand__` since the former is a
    reserved identifier and therefor ill-formed according to the C
    ISO Standard.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/lua/extension.h        |    6 +++---
 modules/lua/extension_thread.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/lua/extension.h b/modules/lua/extension.h
index 1626334..fc19a25 100644
--- a/modules/lua/extension.h
+++ b/modules/lua/extension.h
@@ -102,12 +102,12 @@ int Activate( extensions_manager_t *p_mgr, extension_t * );
 bool IsActivated( extensions_manager_t *p_mgr, extension_t * );
 int Deactivate( extensions_manager_t *p_mgr, extension_t * );
 void KillExtension( extensions_manager_t *p_mgr, extension_t *p_ext );
-int __PushCommand( extension_t *ext, bool unique, command_type_e cmd, va_list options );
+int PushCommand__( extension_t *ext, bool unique, command_type_e cmd, va_list options );
 static inline int PushCommand( extension_t *ext, int cmd, ... )
 {
     va_list args;
     va_start( args, cmd );
-    int i_ret = __PushCommand( ext, false, cmd, args );
+    int i_ret = PushCommand__( ext, false, cmd, args );
     va_end( args );
     return i_ret;
 }
@@ -115,7 +115,7 @@ static inline int PushCommandUnique( extension_t *ext, int cmd, ... )
 {
     va_list args;
     va_start( args, cmd );
-    int i_ret = __PushCommand( ext, true, cmd, args );
+    int i_ret = PushCommand__( ext, true, cmd, args );
     va_end( args );
     return i_ret;
 }
diff --git a/modules/lua/extension_thread.c b/modules/lua/extension_thread.c
index c8b2224..a345b26 100644
--- a/modules/lua/extension_thread.c
+++ b/modules/lua/extension_thread.c
@@ -224,7 +224,7 @@ void KillExtension( extensions_manager_t *p_mgr, extension_t *p_ext )
 }
 
 /** Push a UI command */
-int __PushCommand( extension_t *p_ext,  bool b_unique, command_type_e i_command,
+int PushCommand__( extension_t *p_ext,  bool b_unique, command_type_e i_command,
                    va_list args )
 {
     vlc_mutex_lock( &p_ext->p_sys->command_lock );