From 0ecd2e865ab5272bbcdbcba7fccb6286c6bc2e34 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 2 May 2023 21:41:06 +0100 Subject: [PATCH] Fix a linux/gcc issue where sizeof(wchar_t)==4. (PR #1218) --- source/Speaker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Speaker.cpp b/source/Speaker.cpp index fc972fd9..4d3d7ee3 100644 --- a/source/Speaker.cpp +++ b/source/Speaker.cpp @@ -634,14 +634,14 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa if(dwBufferSize0) { - wmemset((wchar_t*)pDSLockedBuffer0, (wchar_t)DCFilter(g_nSpeakerData), dwBufferSize0/sizeof(wchar_t)); + std::fill_n(pDSLockedBuffer0, dwBufferSize0/sizeof(short), DCFilter(g_nSpeakerData)); if (g_bSpkrOutputToRiff) RiffPutSamples(pDSLockedBuffer0, dwBufferSize0/sizeof(short)); } if(pDSLockedBuffer1) { - wmemset((wchar_t*)pDSLockedBuffer1, (wchar_t)DCFilter(g_nSpeakerData), dwBufferSize1/sizeof(wchar_t)); + std::fill_n(pDSLockedBuffer1, dwBufferSize1/sizeof(short), DCFilter(g_nSpeakerData)); if (g_bSpkrOutputToRiff) RiffPutSamples(pDSLockedBuffer1, dwBufferSize1/sizeof(short)); }