From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 7 Feb 2010 11:13:09 +0000 (+0200)
Subject: common: remove leading underscores
X-Git-Tag: 1.1.0-ff~324
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0ec6ee7cbd6afca8ef5243b9617d9ec42e4803f8;p=vlc

common: remove leading underscores
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index e00812ca95..527a2ea28b 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -156,13 +156,13 @@ typedef uint32_t vlc_fourcc_t;
  * \param fcc a vlc_fourcc_t
  * \param psz_fourcc string to store string representation of vlc_fourcc in
  */
-static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc )
+static inline void vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc )
 {
     memcpy( psz_fourcc, &fcc, 4 );
 }
 
 #define vlc_fourcc_to_char( a, b ) \
-    __vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) )
+        vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) )
 
 /*****************************************************************************
  * Classes declaration
@@ -839,8 +839,8 @@ VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **,
 VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
 
 /* execve wrapper (defined in src/extras/libc.c) */
-VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED );
-#define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
+VLC_EXPORT( int, vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED );
+#define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
 
 /* dir wrappers (defined in src/extras/libc.c) */
 VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir ));
diff --git a/src/extras/libc.c b/src/extras/libc.c
index 5a69137bc7..11cabc312f 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -581,14 +581,15 @@ bool vlc_ureduce( unsigned *pi_dst_nom, unsigned *pi_dst_den,
     return b_exact;
 }
 
+#undef vlc_execve
 /*************************************************************************
  * vlc_execve: Execute an external program with a given environment,
  * wait until it finishes and return its standard output
  *************************************************************************/
-int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
-                  char *const *ppsz_env, const char *psz_cwd,
-                  const char *p_in, size_t i_in,
-                  char **pp_data, size_t *pi_data )
+int vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
+                char *const *ppsz_env, const char *psz_cwd,
+                const char *p_in, size_t i_in,
+                char **pp_data, size_t *pi_data )
 {
     (void)i_argc; // <-- hmph
 #ifdef HAVE_FORK
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 18cfd6f2e5..01a491a114 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -491,7 +491,7 @@ vlc_event_manager_fini
 vlc_event_manager_init
 vlc_event_manager_register_event_type
 vlc_event_send
-__vlc_execve
+vlc_execve
 vlc_fastmem_register
 vlc_freeaddrinfo
 vlc_fourcc_GetCodec