[vlc-commits] Win32: fix some time includes

Martell Malone git at videolan.org
Sat Nov 29 12:32:12 CET 2014


vlc/vlc-2.2 | branch: master | Martell Malone <martellmalone at gmail.com> | Tue Nov 25 11:24:09 2014 +0000| [e208c9d7b0622f5f9645155a880d0d55d1902649] | committer: Jean-Baptiste Kempf

Win32: fix some time includes

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit af187120302f81f3993d5234e860457318b8d68c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mkv/mkv.hpp |    4 +---
 src/win32/thread.c        |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 0638914..36938e8 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -45,9 +45,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#ifdef HAVE_TIME_H
-#   include <time.h>                                               /* time() */
-#endif
+#include <time.h>
 
 #include <vlc_meta.h>
 #include <vlc_charset.h>
diff --git a/src/win32/thread.c b/src/win32/thread.c
index fe17ad5..08f4295 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -37,6 +37,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <errno.h>
+#include <time.h>
 
 /*** Static mutex and condition variable ***/
 static vlc_mutex_t super_mutex;



More information about the vlc-commits mailing list