Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-26 10:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Removed spurious #includes of Windows.h.

Browse Source 
Fixed some more calling convention annotations.
Don't mutate the prefs string in init_tcp_listen_ports.
This commit is contained in:
James Touton 2015-08-06 02:18:21 -07:00
parent 4499902ac5
commit 9b8238ee3e
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/src/Windows/cdenable/cache.cpp
View File

@ -27,7 +27,6 @@
*/ */
#include "sysdeps.h" #include "sysdeps.h"
#include "windows.h"
#include "cache.h" #include "cache.h"
#ifdef __cplusplus #ifdef __cplusplus

1
BasiliskII/src/Windows/cdenable/eject_nt.cpp
View File

@ -22,7 +22,6 @@
#include "sysdeps.h" #include "sysdeps.h"
#include "windows.h"
#include <winioctl.h> #include <winioctl.h>
// Prototypes // Prototypes

1
BasiliskII/src/Windows/cdenable/ntcd.cpp
View File

@ -21,7 +21,6 @@
*/ */
#include "sysdeps.h" #include "sysdeps.h"
#include <windows.h>
extern "C" { extern "C" {

4
BasiliskII/src/Windows/router/router.cpp
View File

@ -28,8 +28,6 @@
#include "sysdeps.h" #include "sysdeps.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <process.h> #include <process.h>
#include "cpu_emulation.h" #include "cpu_emulation.h"
@ -147,7 +145,7 @@ bool router_read_packet(uint8 *packet, int len)
Arguably an ugly hack, but needed since there is no way to Arguably an ugly hack, but needed since there is no way to
listen to all ports w/o writing another ndis filter driver listen to all ports w/o writing another ndis filter driver
*/ */
static WINAPI unsigned int router_expire_thread(void *arg) static unsigned int WINAPI router_expire_thread(void *arg)
{ {
while(!is_router_shutting_down) { while(!is_router_shutting_down) {
close_old_sockets(); close_old_sockets();

10
BasiliskII/src/Windows/router/tcp.cpp
View File

@ -67,8 +67,6 @@
#include "sysdeps.h" #include "sysdeps.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <process.h> #include <process.h>
#include "cpu_emulation.h" #include "cpu_emulation.h"
@ -1333,7 +1331,7 @@ void write_tcp( tcp_t *tcp, int len )
- Expire time-waits. - Expire time-waits.
- Handle resend timeouts. - Handle resend timeouts.
*/ */
static WINAPI unsigned int tcp_connect_close_thread(void *arg) static unsigned int WINAPI tcp_connect_close_thread(void *arg)
{ {
WSAEVENT wait_handles[MAX_SOCKETS]; WSAEVENT wait_handles[MAX_SOCKETS];
@ -1429,7 +1427,7 @@ static WINAPI unsigned int tcp_connect_close_thread(void *arg)
return 0; return 0;
} }
static WINAPI unsigned int tcp_listen_thread(void *arg) static unsigned int WINAPI tcp_listen_thread(void *arg)
{ {
WSAEVENT wait_handles[MAX_SOCKETS]; WSAEVENT wait_handles[MAX_SOCKETS];
@ -1505,9 +1503,9 @@ static void init_tcp_listen_ports()
const char *port_str; const char *port_str;
while ((port_str = PrefsFindString("tcp_port", index++)) != NULL) { while ((port_str = PrefsFindString("tcp_port", index++)) != NULL) {
uint32 iface = 0; uint32 iface = 0;
char *if_str = strchr(port_str,','); const char *if_str = strchr(port_str,',');
if(if_str) { if(if_str) {
*if_str++ = 0; if_str++;
uint32 if_net = _inet_addr( if_str ); uint32 if_net = _inet_addr( if_str );
if(if_net == INADDR_NONE) if_net = INADDR_ANY; if(if_net == INADDR_NONE) if_net = INADDR_ANY;
iface = ntohl( if_net ); iface = ntohl( if_net );