Skip to content

V
vlc-2-2
Commit 707279b4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Merge vlc_threads.h and vlc_threads_funcs.h

parent 4c35dd21
Expand all Show whitespace changes
Inline Side-by-side
Showing with 437 additions and 485 deletions
include/vlc_common.h
View file @ 707279b4
...@@ -930,7 +930,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) ); ...@@ -930,7 +930,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
#include "vlc_variables.h" #include "vlc_variables.h"
#include "vlc_objects.h" #include "vlc_objects.h"
#include "vlc_mtime.h" #include "vlc_mtime.h"
#include "vlc_threads_funcs.h"
#include "vlc_modules.h" #include "vlc_modules.h"
#include "vlc_main.h" #include "vlc_main.h"
#include "vlc_configuration.h" #include "vlc_configuration.h"
......
include/vlc_threads.h
View file @ 707279b4
This diff is collapsed.
include/vlc_threads_funcs.h deleted 100644 → 0
View file @ 4c35dd21
This diff is collapsed.
src/Makefile.am
View file @ 707279b4
...@@ -47,7 +47,6 @@ pluginsinclude_HEADERS = \ ...@@ -47,7 +47,6 @@ pluginsinclude_HEADERS = \
../include/vlc_objects.h \ ../include/vlc_objects.h \
../include/vlc_plugin.h \ ../include/vlc_plugin.h \
../include/vlc_threads.h \ ../include/vlc_threads.h \
../include/vlc_threads_funcs.h \
../include/vlc_variables.h \ ../include/vlc_variables.h \
$(NULL) $(NULL)
......
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