diff --git a/src/iwm_35_525.h b/src/iwm_35_525.h index 3508383..04daec7 100644 --- a/src/iwm_35_525.h +++ b/src/iwm_35_525.h @@ -231,7 +231,7 @@ IWM_WRITE_ROUT (Disk *dsk, word32 val, int fast_disk_emul, double dcycs) word32 prev_val; double dcycs_this_nib; double dcycs_passed; - int sdiff; + double sdiff; int prev_bits; if((!dsk->file) || dsk->trks == 0) { diff --git a/src/parallel.c b/src/parallel.c index 6ef4130..3156827 100644 --- a/src/parallel.c +++ b/src/parallel.c @@ -32,7 +32,7 @@ parallel port, files, and additional types of emulated printers. extern int g_parallel_out_masking; extern word32 g_vbl_count; extern int g_printer_timeout; -int printer_vbl_count = 0; +word32 printer_vbl_count = 0; int port_block = 0; byte parallel_read(word16 io_address) diff --git a/src/sim65816.c b/src/sim65816.c index 94cb768..bd099d7 100644 --- a/src/sim65816.c +++ b/src/sim65816.c @@ -32,10 +32,12 @@ #define vsnprintf _vsnprintf #endif -#if defined (_WIN32) || defined(__CYGWIN__) +#if defined(__CYGWIN__) #define WIN32_LEAN_AND_MEAN /* Tell windows we want less header gunk */ #define STRICT /* Tell Windows we want compile type checks */ #include /* Need a definition for LPTSTR in CYGWIN */ +#endif +#if defined (_WIN32) || defined(__CYGWIN__) extern void get_cwd(LPTSTR buffer, int size); #endif @@ -910,7 +912,6 @@ gsportmain(int argc, char **argv) int tmp1; int i; char *final_arg = 0; - char *filename_ptr; // OG Restoring globals sim65816_initglobals(); @@ -1070,7 +1071,7 @@ gsportmain(int argc, char **argv) // ...and flag it to boot cfg_inspect_maybe_insert_file(final_arg, 1); } - printer_init(g_printer_dpi,85,110,g_printer_output,g_printer_multipage); + printer_init(g_printer_dpi,85,110,g_printer_output,g_printer_multipage != 0); //If ethernet is enabled in config.gsport, let's initialize it #ifdef HAVE_TFE if (g_ethernet == 1) diff --git a/src/win_generic.c b/src/win_generic.c index 87e5c1d..b59026b 100644 --- a/src/win_generic.c +++ b/src/win_generic.c @@ -451,7 +451,7 @@ win_event_redraw() LRESULT CALLBACK win_event_handler(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { -int i, j; +int i; int numDraggedFiles; int szFilename; LPTSTR lpszFile;