From: Rémi Denis-Courmont <rem@videolan.org>
Date: Fri, 2 May 2008 16:06:43 +0000 (+0300)
Subject: main.h -> vlc_main.h
X-Git-Tag: 0.9.0-test0~1240
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=89d56df65a72b099ce6a10bc35c8f4e71dce4f5f;p=vlc

main.h -> vlc_main.h
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 05d98ac54c..32cf14efb3 100644
--- 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 ea4469b4c9..799458a288 100644
--- 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 \