common: remove leading underscores

[vlc] / src / extras / libc.c

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 368f01a71c7ff7d67653cc795e9ab14b016d3ca3..11cabc312f2bbbca9cab0a1f36a39a25a6c391ac 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -31,9 +31,6 @@
 
 #include <vlc_common.h>
 
-#include <ctype.h>
-
-
 #undef iconv_t
 #undef iconv_open
 #undef iconv
@@ -49,11 +46,9 @@
 
 #ifdef HAVE_FORK
 #   include <signal.h>
-#   include <sys/time.h>
 #   include <unistd.h>
 #   include <errno.h>
 #   include <sys/wait.h>
-#   include <fcntl.h>
 #   include <sys/socket.h>
 #   include <sys/poll.h>
 #   ifndef PF_LOCAL
@@ -586,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
@@ -628,7 +624,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char *const *ppsz_argv,
              && ((psz_cwd == NULL) || (chdir (psz_cwd) == 0)))
                 execve (ppsz_argv[0], ppsz_argv, ppsz_env);
 
-            exit (EXIT_FAILURE);
+            _exit (EXIT_FAILURE);
         }
     }