vlc | branch: master | Felix Abecassis <[email protected]> | Fri Nov 29 17:41:27 2013 +0100| [48edfbb98806f976536008e5561535efeed6f009] | committer: Rémi Denis-Courmont
Fix concatenation of Unicode string literals. Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48edfbb98806f976536008e5561535efeed6f009 --- src/config/help.c | 2 +- src/win32/specific.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/help.c b/src/config/help.c index 20e4f7c..155dc50 100644 --- a/src/config/help.c +++ b/src/config/help.c @@ -685,7 +685,7 @@ static void ShowConsole( void ) * Unicode/locale subsystem. By default, we have the obsolecent OEM code * page (e.g. CP437 or CP850). */ SetConsoleOutputCP (GetACP ()); - SetConsoleTitle (TEXT("VLC media player version "PACKAGE_VERSION)); + SetConsoleTitle (TEXT("VLC media player version ") TEXT(PACKAGE_VERSION)); freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); diff --git a/src/win32/specific.c b/src/win32/specific.c index 499a20c..44529df 100644 --- a/src/win32/specific.c +++ b/src/win32/specific.c @@ -109,7 +109,7 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_ msg_Info( p_this, "one instance mode ENABLED"); /* Use a named mutex to check if another instance is already running */ - if( !( hmutex = CreateMutex( 0, TRUE, L"VLC ipc "VERSION ) ) ) + if( !( hmutex = CreateMutex( 0, TRUE, L"VLC ipc " TEXT(VERSION) ) ) ) { /* Failed for some reason. Just ignore the option and go on as * normal. */ @@ -154,7 +154,7 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_ /* Locate the window created by the IPC helper thread of the * 1st instance */ - if( !( ipcwindow = FindWindow( 0, L"VLC ipc "VERSION ) ) ) + if( !( ipcwindow = FindWindow( 0, L"VLC ipc " TEXT(VERSION) ) ) ) { msg_Err( p_this, "one instance mode DISABLED " "(couldn't find 1st instance of program)" ); @@ -221,7 +221,7 @@ static unsigned __stdcall IPCHelperThread( void *data ) ipcwindow = CreateWindow( L"STATIC", /* name of window class */ - L"VLC ipc "VERSION, /* window title bar text */ + L"VLC ipc " TEXT(VERSION), /* window title bar text */ 0, /* window style */ 0, /* default X coordinate */ 0, /* default Y coordinate */ @@ -331,7 +331,7 @@ void system_End(void) /* FIXME: thread-safety... */ if (p_helper) { - if( ( ipcwindow = FindWindow( 0, L"VLC ipc "VERSION ) ) != 0 ) + if( ( ipcwindow = FindWindow( 0, L"VLC ipc " TEXT(VERSION) ) ) != 0 ) { SendMessage( ipcwindow, WM_QUIT, 0, 0 ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
