From 8bcf09f2a74a3236033a8d304d2022fcfd4ae09d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 6 Oct 2023 14:55:10 +0300
Subject: [PATCH] spc_emu: remove unnecessary c++20 designated initializers
from rsn code
may lead to warnings in c++11 mode.
---
gme/Spc_Emu.cpp | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gme/Spc_Emu.cpp b/gme/Spc_Emu.cpp
index 9f9d0a6..e7e60cf 100644
--- a/gme/Spc_Emu.cpp
+++ b/gme/Spc_Emu.cpp
@@ -300,11 +300,11 @@ extern gme_type_t const gme_spc_type = &gme_spc_type_;
#ifdef RARDLL
static int CALLBACK call_rsn(UINT msg, LPARAM UserData, LPARAM P1, LPARAM P2)
{
- (void) msg;
byte **bp = (byte **)UserData;
unsigned char *addr = (unsigned char *)P1;
memcpy( *bp, addr, P2 );
*bp += P2;
+ (void) msg;
return 0;
}
#endif
@@ -318,17 +318,14 @@ struct Rsn_File : Spc_File
blargg_err_t load_archive( const char* path )
{
#ifdef RARDLL
- struct RAROpenArchiveData data = {
- .ArcName = (char *)path,
- .OpenMode = RAR_OM_LIST, .OpenResult = 0,
- .CmtBuf = 0, .CmtBufSize = 0, .CmtSize = 0, .CmtState = 0
- };
+ struct RAROpenArchiveData data = { NULL, RAR_OM_LIST, 0, NULL, 0, 0, 0 };
// get the size of all unpacked headers combined
long pos = 0;
int count = 0;
unsigned biggest = 0;
blargg_vector<byte> temp;
+ data.ArcName = (char *)path;
HANDLE rar = RAROpenArchive( &data );
struct RARHeaderData head;
for ( ; RARReadHeader( rar, &head ) == ERAR_SUCCESS; count++ )
@@ -518,15 +515,12 @@ blargg_err_t Spc_Emu::play_( long count, sample_t* out )
blargg_err_t Rsn_Emu::load_archive( const char* path )
{
#ifdef RARDLL
- struct RAROpenArchiveData data = {
- .ArcName = (char *)path,
- .OpenMode = RAR_OM_LIST, .OpenResult = 0,
- .CmtBuf = 0, .CmtBufSize = 0, .CmtSize = 0, .CmtState = 0
- };
+ struct RAROpenArchiveData data = { NULL, RAR_OM_LIST, 0, NULL, 0, 0, 0 };
// get the file count and unpacked size
long pos = 0;
int count = 0;
+ data.ArcName = (char *)path;
HANDLE rar = RAROpenArchive( &data );
struct RARHeaderData head;
for ( ; RARReadHeader( rar, &head ) == ERAR_SUCCESS; count++ )