mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1847) Adjustment for MorphOS to unbreak the build there and removal of some now obsolete preprocessor magic

release/0.4.5
tron 2005-02-08 15:42:28 +00:00
parent 0525b08612
commit 1afad51ee2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network_core.h
View File

@ -120,6 +120,7 @@ typedef unsigned long in_addr_t;
# if defined(__MORPHOS__) # if defined(__MORPHOS__)
# include <sys/filio.h> // FIO* defines # include <sys/filio.h> // FIO* defines
# include <sys/sockio.h> // SIO* defines # include <sys/sockio.h> // SIO* defines
# include <netinet/in.h>
# else // __AMIGA__ # else // __AMIGA__
# include <proto/socket.h> # include <proto/socket.h>
# endif # endif
@ -131,6 +132,7 @@ typedef unsigned long in_addr_t;
# define ioctl ioctlsocket # define ioctl ioctlsocket
typedef unsigned int in_addr_t; typedef unsigned int in_addr_t;
typedef long socklen_t;
extern struct Library *SocketBase; extern struct Library *SocketBase;
# ifdef __AMIGA__ # ifdef __AMIGA__

6
network_udp.c
View File

@ -402,11 +402,7 @@ void NetworkUDPClose(void)
void NetworkUDPReceive(SOCKET udp) void NetworkUDPReceive(SOCKET udp)
{ {
struct sockaddr_in client_addr; struct sockaddr_in client_addr;
#ifndef __MORPHOS__ socklen_t client_len;
int client_len;
#else
LONG client_len; // for some reason we need a 'LONG' under MorphOS
#endif
int nbytes; int nbytes;
static Packet *p = NULL; static Packet *p = NULL;
int packet_len; int packet_len;