[vlc-devel] [PATCH] Fix the latest mingw-w64 crt trunk

[Jean-Baptiste Kempf]

Wasn't this already merged?

On 28 Nov, Martell Malone wrote :
> ping ?
> Is this patch good to merge or do I need to make changes ?
> 
> Kind Regards
> 
> On Tue, Nov 25, 2014 at 12:24 PM, Martell Malone <martellmalone at gmail.com>
> wrote:
> 
> > In that case.
> >
> > Updated patch
> >
> > From 1c621a9c7dafe365623bc2c7199a52736f0a3983 Mon Sep 17 00:00:00 2001
> > From: Martell Malone <martellmalone at gmail.com>
> > Date: Tue, 25 Nov 2014 12:22:09 +0000
> > Subject: [PATCH] fix some time includes
> >
> > ---
> >  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 8c5af80..392b9e7 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 7dcfc4c..9bc787d 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;
> > --
> > 2.1.3
> >
> > On Tue, Nov 25, 2014 at 12:18 PM, Rémi Denis-Courmont <remi at remlab.net>
> > wrote:
> >
> >> Le 2014-11-25 15:05, Martell Malone a écrit :
> >>
> >>> #ifdef HAVE_CONFIG_H
> >>>> # include "config.h"
> >>>> #endif
> >>>> #include <inttypes.h>
> >>>> #include <vlc_common.h>
> >>>> #include <vlc_plugin.h>
> >>>> #ifdef HAVE_TIME_H
> >>>> #   include <time.h>
> >>>>                 /* time() */
> >>>> #endif
> >>>>
> >>>
> >>> at the start so I dont understand why time.h is being missed here ?
> >>>
> >>
> >> Because nothing defines HAVE_TIME_H. The ifdef is bogus.
> >>
> >>
> >> --
> >> Rémi Denis-Courmont
> >> _______________________________________________
> >> vlc-devel mailing list
> >> To unsubscribe or modify your subscription options:
> >> https://mailman.videolan.org/listinfo/vlc-devel
> >>
> >
> >

> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device