1 |
--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.64bit-fixes 2001-07-22 17:03:13.000000000 -0400 |
2 |
+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2005-09-05 08:38:07.000000000 -0400 |
3 |
@@ -23,6 +23,7 @@ |
4 |
*/ |
5 |
|
6 |
#include <stdio.h> |
7 |
+#include <stdint.h> |
8 |
|
9 |
#include "SDL_FrameBuf.h" |
10 |
#include "pixel.h" |
11 |
@@ -848,8 +849,8 @@ FrameBuf:: AddDirtyRect(SDL_Rect *rect) |
12 |
for ( i=0; i<dirtymaplen; ++i ) { |
13 |
if ( dirtymap[i] != NULL ) { |
14 |
dirtymap[i] = (SDL_Rect *)( |
15 |
- ((int)dirtymap[i]-(int)updatelist) + |
16 |
- (int)newlist |
17 |
+ ((uintptr_t)dirtymap[i]-(uintptr_t)updatelist) + |
18 |
+ (uintptr_t)newlist |
19 |
); |
20 |
} |
21 |
} |
22 |
--- Maelstrom-3.0.6/Maelstrom-netd.c.64bit-fixes 2000-02-12 04:58:59.000000000 -0500 |
23 |
+++ Maelstrom-3.0.6/Maelstrom-netd.c 2005-09-05 08:40:52.000000000 -0400 |
24 |
@@ -3,12 +3,15 @@ |
25 |
|
26 |
#include <stdio.h> |
27 |
#include <string.h> |
28 |
+#include <stdlib.h> |
29 |
+#include <time.h> |
30 |
#include <signal.h> |
31 |
#include <errno.h> |
32 |
#include <sys/types.h> |
33 |
#include <sys/time.h> |
34 |
#include <sys/socket.h> |
35 |
#include <netinet/in.h> |
36 |
+#include <arpa/inet.h> |
37 |
#include <netdb.h> |
38 |
#include <unistd.h> |
39 |
|
40 |
@@ -154,7 +157,7 @@ printf("Let's party!!\n"); |
41 |
for ( i=0; i<numplayers; ++i ) { |
42 |
connection *player = &players[positions[i]]; |
43 |
|
44 |
- strcpy(ptr, (char *)inet_ntoa(player->raddr.sin_addr)); |
45 |
+ strcpy(ptr, inet_ntoa(player->raddr.sin_addr)); |
46 |
printf("Setting up player %d at host %s and port ", i+1, ptr); |
47 |
len += strlen(ptr)+1; |
48 |
ptr += strlen(ptr)+1; |
49 |
@@ -255,7 +258,8 @@ printf("Waiting for players...\n"); |
50 |
|
51 |
/* Check for new players first */ |
52 |
if ( FD_ISSET(netfd, &fdset) ) { |
53 |
- int sockfd, clilen; |
54 |
+ int sockfd; |
55 |
+ socklen_t clilen; |
56 |
|
57 |
for ( i=0; i<MAX_CONNECTIONS; ++i ) { |
58 |
if ( players[i].state == UNCONNECTED ) |