Skip to content

Silence two warnings #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pstef wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Silence two warnings #959

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0edaf0e
Don't use bitwise-or with boolean operands
pstef Oct 19, 2024
b8655eb
Use the same type on both sides of comparison
pstef Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libretro/libretro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ bool retro_load_game(const struct retro_game_info *game)
}

else
if ((is_bsx((uint8 *) game->data + 0x7fc0)==1) | (is_bsx((uint8 *) game->data + 0xffc0)==1)) {
if ((is_bsx((uint8 *) game->data + 0x7fc0)==1) || (is_bsx((uint8 *) game->data + 0xffc0)==1)) {
if ((rom_loaded = LoadBIOS(biosrom,"BS-X.bin",0x100000)))
rom_loaded = Memory.LoadMultiCartMem(biosrom, 0x100000, (const uint8_t*)game->data, game->size, 0, 0);
}
Expand Down Expand Up @@ -1148,7 +1148,7 @@ bool retro_load_game(const struct retro_game_info *game)
if (randomize_memory)
{
srand(time(NULL));
for(int lcv = 0; lcv < sizeof(Memory.RAM); lcv++)
for(size_t lcv = 0; lcv < sizeof(Memory.RAM); lcv++)
Memory.RAM[lcv] = rand() % 256;
}
}
Expand Down