Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ARRAYSIZE macro with another ugly macro. At least this will throw an error for a non-array and won't conflict with Windows macro names.

Browse Source
This commit is contained in:
Jordan Woyak committed 2013-09-11 19:19:36 -05:00
1 parent ce49964dfe
commit fde3815d34
7 files changed
+45 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ void GeckoSockServer::ClientThread()
char data[128];
std::size_t got = 0;
if (client.Receive(&data[0], ARRAYSIZE(data), got) == sf::Socket::Disconnected)
if (client.Receive(&data[0], ArraySize(data), got) == sf::Socket::Disconnected)
client_running = false;
if (got != 0)
Source/Core/Core/Src/Movie.cpp
+5 -5
View File
@@ -696,7 +696,7 @@ void ReadHeader()
bongos = tmpHeader.bongos;
bSyncGPU = tmpHeader.bSyncGPU;
bNetPlay = tmpHeader.bNetPlay;
memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision));
memcpy(revision, tmpHeader.revision, ArraySize(revision));
}
else
{
@@ -1110,7 +1110,7 @@ void SaveRecording(const char *filename)
header.bProgressive = bProgressive;
header.bDSPHLE = bDSPHLE;
header.bFastDiscSpeed = bFastDiscSpeed;
strncpy((char *)header.videoBackend, videoBackend.c_str(),ARRAYSIZE(header.videoBackend));
strncpy((char *)header.videoBackend, videoBackend.c_str(),ArraySize(header.videoBackend));
header.CPUCore = iCPUCore;
header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable;
header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable;
@@ -1123,11 +1123,11 @@ void SaveRecording(const char *filename)
header.bClearSave = g_bClearSave;
header.bSyncGPU = bSyncGPU;
header.bNetPlay = bNetPlay;
strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange));
strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author));
strncpy((char *)header.discChange, g_discChange.c_str(),ArraySize(header.discChange));
strncpy((char *)header.author, author.c_str(),ArraySize(header.author));
memcpy(header.md5,MD5,16);
header.bongos = bongos;
memcpy(header.revision, revision, ARRAYSIZE(header.revision));
memcpy(header.revision, revision, ArraySize(header.revision));
// TODO
header.uniqueID = 0;