Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some Warning removed and 64bits

This commit is contained in:
jvernet 2017-10-03 21:37:24 +02:00
parent 54ea054993
commit 1316b64bb7
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BasiliskII/src/MacOSX/sys_darwin.cpp
View File

@ -256,10 +256,10 @@ void DarwinAddFloppyPrefs(void)
}
// Iterate through each floppy
while ( nextFloppy = IOIteratorNext(allFloppies))
while ( (nextFloppy = IOIteratorNext(allFloppies)))
{
char bsdPath[MAXPATHLEN];
long size;
long size = 0;
Boolean gotSize = FALSE;
CFTypeRef sizeAsCFNumber =
IORegistryEntryCreateCFProperty(nextFloppy,
@ -333,7 +333,7 @@ void DarwinAddSerialPrefs(void)
}
// Iterate through each modem
while ( nextModem = IOIteratorNext(allModems))
while ( (nextModem = IOIteratorNext(allModems)))
{
char bsdPath[MAXPATHLEN];
CFTypeRef bsdPathAsCFString =

2
BasiliskII/src/Unix/sysdeps.h
View File

@ -219,7 +219,7 @@ typedef uae_u32 uaecptr;
/* Timing functions */
extern uint64 GetTicks_usec(void);
extern void Delay_usec(uint32 usec);
extern void Delay_usec(uint64 usec);
/* Spinlocks */
#ifdef __GNUC__

2
BasiliskII/src/Unix/timer_unix.cpp
View File

@ -264,7 +264,7 @@ uint64 GetTicks_usec(void)
#define USE_COND_TIMEDWAIT
#endif
void Delay_usec(uint32 usec)
void Delay_usec(uint64 usec)
{
int was_error;

4
BasiliskII/src/include/version.h
View File

@ -22,8 +22,8 @@
#define VERSION_H
const int VERSION_MAJOR = 1;
const int VERSION_MINOR = 0;
const int VERSION_MINOR = 1;
#define VERSION_STRING "Basilisk II V1.0"
#define VERSION_STRING "Basilisk II V1.0 SDL2"
#endif

2
BasiliskII/src/timer.cpp
View File

@ -173,7 +173,7 @@ void TimerReset(void)
int16 InsTime(uint32 tm, uint16 trap)
{
D(bug("InsTime %08lx, trap %04x\n", tm, trap));
WriteMacInt16(tm + qType, ReadMacInt16(tm + qType) & 0x1fff | (trap << 4) & 0x6000);
WriteMacInt16(tm + qType, (ReadMacInt16(tm + qType) & 0x1fff) | ((trap << 4) & 0x6000));
if (find_desc(tm) >= 0)
printf("WARNING: InsTime(): Task re-inserted\n");
else {