From 89d56df65a72b099ce6a10bc35c8f4e71dce4f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Fri, 2 May 2008 19:06:43 +0300
Subject: [PATCH] main.h -> vlc_main.h
---
include/vlc_common.h | 2 +-
include/{main.h => vlc_main.h} | 0
src/Makefile.am | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/{main.h => vlc_main.h} (100%)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 05d98ac54c8c..32cf14efb315 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 ea4469b4c92c..799458a288eb 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 \
--
GitLab