folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Silence potential compiler warnings on Windows using GCC

Browse source
This commit is contained in:
Mark Pizzolato 2018-09-27 22:01:40 -07:00
parent 6747c7fdc2
commit f48c282dff
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim_fio.c
View file

@ -446,7 +446,7 @@ if ((*shmem)->hMapping == INVALID_HANDLE_VALUE) {
sim_shmem_close (*shmem); sim_shmem_close (*shmem);
*shmem = NULL; *shmem = NULL;
return sim_messagef (SCPE_OPENERR, "Can't CreateFileMapping of a %u byte shared memory segment '%s' - LastError=0x%X\n", size, name, LastError); return sim_messagef (SCPE_OPENERR, "Can't CreateFileMapping of a %u byte shared memory segment '%s' - LastError=0x%X\n", (unsigned int)size, name, (unsigned int)LastError);
} }
AlreadyExists = (GetLastError () == ERROR_ALREADY_EXISTS); AlreadyExists = (GetLastError () == ERROR_ALREADY_EXISTS);
(*shmem)->shm_base = MapViewOfFile ((*shmem)->hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0); (*shmem)->shm_base = MapViewOfFile ((*shmem)->hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0);
@ -455,7 +455,7 @@ if ((*shmem)->shm_base == NULL) {
sim_shmem_close (*shmem); sim_shmem_close (*shmem);
*shmem = NULL; *shmem = NULL;
return sim_messagef (SCPE_OPENERR, "Can't MapViewOfFile() of a %u byte shared memory segment '%s' - LastError=0x%X\n", size, name, LastError); return sim_messagef (SCPE_OPENERR, "Can't MapViewOfFile() of a %u byte shared memory segment '%s' - LastError=0x%X\n", (unsigned int)size, name, (unsigned int)LastError);
} }
if (AlreadyExists) { if (AlreadyExists) {
if (*((DWORD *)((*shmem)->shm_base)) == 0) if (*((DWORD *)((*shmem)->shm_base)) == 0)
@ -464,7 +464,7 @@ if (AlreadyExists) {
DWORD SizeFound = *((DWORD *)((*shmem)->shm_base)); DWORD SizeFound = *((DWORD *)((*shmem)->shm_base));
sim_shmem_close (*shmem); sim_shmem_close (*shmem);
*shmem = NULL; *shmem = NULL;
return sim_messagef (SCPE_OPENERR, "Shared Memory segment '%s' is %u bytes instead of %d\n", name, SizeFound, (int)size); return sim_messagef (SCPE_OPENERR, "Shared Memory segment '%s' is %u bytes instead of %d\n", name, (unsigned int)SizeFound, (int)size);
} }
} }
else else

4
sim_timer.c
View file

@ -443,7 +443,7 @@ MMRESULT mm_status;
mm_status = timeGetDevCaps (&timers, sizeof (timers)); mm_status = timeGetDevCaps (&timers, sizeof (timers));
if (mm_status != TIMERR_NOERROR) { if (mm_status != TIMERR_NOERROR) {
fprintf (stderr, "timeGetDevCaps() returned: 0x%X, Last Error: 0x%X\n", mm_status, GetLastError()); fprintf (stderr, "timeGetDevCaps() returned: 0x%X, Last Error: 0x%X\n", mm_status, (unsigned int)GetLastError());
return 0; return 0;
} }
if (timers.wPeriodMin == 0) { if (timers.wPeriodMin == 0) {
@ -452,7 +452,7 @@ if (timers.wPeriodMin == 0) {
} }
mm_status = timeBeginPeriod (timers.wPeriodMin); mm_status = timeBeginPeriod (timers.wPeriodMin);
if (mm_status != TIMERR_NOERROR) { if (mm_status != TIMERR_NOERROR) {
fprintf (stderr, "timeBeginPeriod() returned: 0x%X, Last Error: 0x%X\n", mm_status, GetLastError()); fprintf (stderr, "timeBeginPeriod() returned: 0x%X, Last Error: 0x%X\n", mm_status, (unsigned int)GetLastError());
return 0; return 0;
} }
atexit (sim_timer_exit); atexit (sim_timer_exit);