Skip to content

V
vlc
Commit 777c432b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

We have a replacement for localtime_r 

(cherry picked from commit 3663b861)

Conflicts:

	src/input/item.c
parent c5876e09
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
src/input/item.c
View file @ 777c432b
...@@ -712,7 +712,6 @@ void input_item_SetEpg( input_item_t *p_item, ...@@ -712,7 +712,6 @@ void input_item_SetEpg( input_item_t *p_item,
{ {
input_item_DelInfo( p_item, psz_epg, NULL ); input_item_DelInfo( p_item, psz_epg, NULL );
#ifdef HAVE_LOCALTIME_R
vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->lock );
for( int i = 0; i < p_epg->i_event; i++ ) for( int i = 0; i < p_epg->i_event; i++ )
{ {
...@@ -745,7 +744,6 @@ void input_item_SetEpg( input_item_t *p_item, ...@@ -745,7 +744,6 @@ void input_item_SetEpg( input_item_t *p_item,
event.type = vlc_InputItemInfoChanged; event.type = vlc_InputItemInfoChanged;
vlc_event_send( &p_item->event_manager, &event ); vlc_event_send( &p_item->event_manager, &event );
} }
#endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment