Always re-arm the cursor hide timeout on movement (fixes: #3915)

[vlc] / src / extras / libc.c

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 115bc0934b0f8dd0e53ca99b2d170d14ca990c44..1be7fe81c84a4d3c2490142d4254f6f46e37d852 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -31,8 +31,7 @@
 
 #include <vlc_common.h>
 
-#include <ctype.h>
-
+#include <errno.h>
 
 #undef iconv_t
 #undef iconv_open
@@ -49,11 +48,8 @@
 
 #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 +582,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