Sophie

Sophie

distrib > Mageia > 5 > x86_64 > by-pkgid > bc2e3f0c12bc0f2208e6ed3859e2360c > files > 1

maelstrom-3.0.6-18.mga5.src.rpm

--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.64bit-fixes	2001-07-22 17:03:13.000000000 -0400
+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2005-09-05 08:38:07.000000000 -0400
@@ -23,6 +23,7 @@
 */
 
 #include <stdio.h>
+#include <stdint.h>
 
 #include "SDL_FrameBuf.h"
 #include "pixel.h"
@@ -848,8 +849,8 @@ FrameBuf:: AddDirtyRect(SDL_Rect *rect)
 			for ( i=0; i<dirtymaplen; ++i ) {
 				if ( dirtymap[i] != NULL ) {
 					dirtymap[i] = (SDL_Rect *)(
-					((int)dirtymap[i]-(int)updatelist) +
-								(int)newlist
+					((uintptr_t)dirtymap[i]-(uintptr_t)updatelist) +
+								(uintptr_t)newlist
 					);
 				}
 			}
--- Maelstrom-3.0.6/Maelstrom-netd.c.64bit-fixes	2000-02-12 04:58:59.000000000 -0500
+++ Maelstrom-3.0.6/Maelstrom-netd.c	2005-09-05 08:40:52.000000000 -0400
@@ -3,12 +3,15 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <time.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
 
@@ -154,7 +157,7 @@ printf("Let's party!!\n");
 		for ( i=0; i<numplayers; ++i ) {
 			connection *player = &players[positions[i]];
 
-			strcpy(ptr, (char *)inet_ntoa(player->raddr.sin_addr));
+			strcpy(ptr, inet_ntoa(player->raddr.sin_addr));
 printf("Setting up player %d at host %s and port ", i+1, ptr);
 			len += strlen(ptr)+1;
 			ptr += strlen(ptr)+1;
@@ -255,7 +258,8 @@ printf("Waiting for players...\n");
 
 		/* Check for new players first */
 		if ( FD_ISSET(netfd, &fdset) ) {
-			int sockfd, clilen;
+			int sockfd;
+			socklen_t clilen;
 
 			for ( i=0; i<MAX_CONNECTIONS; ++i ) {
 				if ( players[i].state == UNCONNECTED )