Fix broken macro token pasting.
Cast argument of format string to avoid warnings. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@28563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,7 +51,7 @@ wxUint32 wxSoundStreamPcm::GetBestSize() const
|
|||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
#define DEFINE_CONV(name, input_type, output_type, convert) \
|
#define DEFINE_CONV(name, input_type, output_type, convert) \
|
||||||
static void Convert_##name##(const void *buf_in, void *buf_out, wxUint32 len) \
|
static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len) \
|
||||||
{\
|
{\
|
||||||
register input_type src; \
|
register input_type src; \
|
||||||
register const input_type *t_buf_in = (input_type *)buf_in; \
|
register const input_type *t_buf_in = (input_type *)buf_in; \
|
||||||
|
@@ -477,7 +477,7 @@ bool wxVideoXANIM::RestartXANIM()
|
|||||||
|
|
||||||
// Build the command
|
// Build the command
|
||||||
xanim_command.Printf(wxT("xanim -Zr +Ze +Sr +f +W%d +f +q "
|
xanim_command.Printf(wxT("xanim -Zr +Ze +Sr +f +W%d +f +q "
|
||||||
"+Av70 %s %s"), m_internal->xanim_window,
|
"+Av70 %s %s"), (int)m_internal->xanim_window,
|
||||||
(xanim_chg_size) ? _T("") : _T(""),
|
(xanim_chg_size) ? _T("") : _T(""),
|
||||||
WXSTRINGCAST m_filename);
|
WXSTRINGCAST m_filename);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user