main.h -> vlc_main.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 05d98ac54c8cfe883e285ba2398ec1cc3af66a51..32cf14efb3159b7d149df7f1cccb059712ff1a0d 100644 (file)
--- a/include/vlc_common.h
+++ b/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 )

diff --git a/include/main.h b/include/vlc_main.h
similarity index 100%
rename from include/main.h
rename to include/vlc_main.h

diff --git a/src/Makefile.am b/src/Makefile.am
index ea4469b4c92c1b15756db4984e7897ba11ab2c18..799458a288eb725c636a1620cf88d33532bc9a70 100644 (file)
--- a/src/Makefile.am
+++ b/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 \