main.h -> vlc_main.h

include/vlc_common.h

@@ -931,7 +931,7 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 #include "vlc_mtime.h"
 #include "vlc_threads_funcs.h"
 #include "vlc_modules.h"
-#include "main.h"
+#include "vlc_main.h"
 #include "vlc_configuration.h"
 
 #if defined( WIN32 ) || defined( UNDER_CE )

src/Makefile.am

@@ -36,11 +36,11 @@ pkginclude_HEADERS = \
 	$(NULL)
 
 pluginsinclude_HEADERS = \
-	../include/main.h \
 	../include/vlc_arrays.h \
 	../include/vlc_common.h \
 	../include/vlc_config.h \
 	../include/vlc_configuration.h \
+	../include/vlc_main.h \
 	../include/vlc_messages.h \
 	../include/vlc_modules.h \
 	../include/vlc_modules_macros.h \