From 18b4556f857ff44bff4b3c45459ff42378481cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sun, 12 Mar 2006 10:41:31 +0000
Subject: [PATCH] Propagate changes from previous commit
---
include/vlc_common.h | 4 +++-
modules/control/http/http.c | 2 ++
modules/gui/wince/interface.cpp | 2 ++
modules/gui/wxwidgets/interface.cpp | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 4f0e3ae9df7e..461de6f86ba3 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1145,14 +1145,16 @@ VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );
VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) );
-VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
VLC_EXPORT( const char *, VLC_Error, ( int ) );
/*****************************************************************************
* Additional vlc stuff
*****************************************************************************/
#ifndef HAVE_SHARED_LIBVLC
+VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
# include "vlc_symbols.h"
+#else
+# define VLC_Changeset( ) ("exported")
#endif
#include "os_specific.h"
#include "vlc_messages.h"
diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 36248fed6d35..eb58e7db6c05 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -538,7 +538,9 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
VLC_CompileDomain() );
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
+#ifndef HAVE_SHARED_LIBVLC
E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
+#endif
E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 10c960e51c8a..599eb6ba2882 100644
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -498,7 +498,9 @@ LRESULT Interface::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
_("Compiled by ") + VLC_CompileBy() + "@" +
VLC_CompileHost() + "." + VLC_CompileDomain() + ".\n" +
_("Compiler: ") + VLC_Compiler() + ".\n" +
+#ifndef HAVE_SHARED_LIBVLC
_("Based on SVN revision: ") + VLC_Changeset() + ".\n\n" +
+#endif
_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/");
diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index d3566690b991..2d519fb30aa9 100644
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -919,7 +919,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
+#ifndef HAVE_SHARED_LIBVLC
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
+#endif
#ifdef __WXMSW__
wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
#else
--
GitLab