[Intrepid-commit] SF.net SVN: intrepid:[11] trunk/src

[<se...@us...>]

Revision: 11
          http://intrepid.svn.sourceforge.net/intrepid/?rev=11&view=rev
Author:   segtor
Date:     2010-05-17 17:56:03 +0000 (Mon, 17 May 2010)

Log Message:
-----------
Work for 64-bit systems

Modified Paths:
--------------
    trunk/src/include/config.h
    trunk/src/include/types.h
    trunk/src/mud/compression.c
    trunk/src/mud/main.c
    trunk/src/mud/ufiles.c

Modified: trunk/src/include/config.h
===================================================================
--- trunk/src/include/config.h	2010-05-16 17:57:13 UTC (rev 10)
+++ trunk/src/include/config.h	2010-05-17 17:56:03 UTC (rev 11)
@@ -23,7 +23,7 @@
 
 #include "types.h"
  
-#define INTREPID_VERSION "0.071"
+#define INTREPID_VERSION "0.072"
 
 #define MUD_SOCKET_PATH "files/pids/mud_alive_socket"
 #define ANGEL_PID "files/pids/ANGEL_PID"

Modified: trunk/src/include/types.h
===================================================================
--- trunk/src/include/types.h	2010-05-16 17:57:13 UTC (rev 10)
+++ trunk/src/include/types.h	2010-05-17 17:56:03 UTC (rev 11)
@@ -21,11 +21,16 @@
 #ifndef __TYPES_H
 #define __TYPES_H
 
+#include <stddef.h>
+
 typedef int int32;
 typedef unsigned int uint32;
 typedef long long int64;
 typedef unsigned long long uint64;
 
+typedef size_t uintsys;
+typedef ptrdiff_t intsys;
+
 struct user;
 typedef void	command_func(struct user *, char *);
 typedef void	user_func(struct user *);

Modified: trunk/src/mud/compression.c
===================================================================
--- trunk/src/mud/compression.c	2010-05-16 17:57:13 UTC (rev 10)
+++ trunk/src/mud/compression.c	2010-05-17 17:56:03 UTC (rev 11)
@@ -265,7 +265,7 @@
 {
   if ((no) && (r))
   {
-    if (((int32) r - (int32) data.where) < data.length)
+    if (((intsys) r - (intsys) data.where) < data.length)
       return get_int32(no, r);
     else
     {
@@ -284,7 +284,7 @@
 {
   if ((no) && (r))
   {
-    if (((int32) r - (int32) data.where) < data.length)
+    if (((intsys) r - (intsys) data.where) < data.length)
       return get_int64(no, r);
     else
     {
@@ -303,7 +303,7 @@
 {
   if ((str) && (r))
   {
-    if (((int32) r - (int32) data.where) < data.length)
+    if (((intsys) r - (intsys) data.where) < data.length)
       return get_string(str, r);
     else
     {
@@ -323,7 +323,7 @@
 {
   if ((number) && (compressed_data))
   {
-    if (((size_t) compressed_data - (size_t) compressed_start) < compress_length)
+    if (((intsys) compressed_data - (intsys) compressed_start) < compress_length)
       return get_int32(number, compressed_data);
     else
     {
@@ -343,7 +343,7 @@
 {
   if ((number) && (compressed_data))
   {
-    if (((size_t) compressed_data - (size_t) compressed_start) < compress_length)
+    if (((intsys) compressed_data - (intsys) compressed_start) < compress_length)
       return get_int64(number, compressed_data);
     else
     {

Modified: trunk/src/mud/main.c
===================================================================
--- trunk/src/mud/main.c	2010-05-16 17:57:13 UTC (rev 10)
+++ trunk/src/mud/main.c	2010-05-17 17:56:03 UTC (rev 11)
@@ -84,7 +84,7 @@
     errno = 0;
     if (stack != stack_start)
     {
-      int32 diff = (int32)stack - (int32)stack_start;
+      intsys diff = (intsys) stack - (intsys) stack_start;
       stack = stack_start;
       vflog("stack", "Lost stack reclaimed %d bytes", diff);
     }

Modified: trunk/src/mud/ufiles.c
===================================================================
--- trunk/src/mud/ufiles.c	2010-05-16 17:57:13 UTC (rev 10)
+++ trunk/src/mud/ufiles.c	2010-05-17 17:56:03 UTC (rev 11)
@@ -93,7 +93,7 @@
   stack = store_int32(stack, u->default_term_lines);
   /* todo: continue adding fields *here* */
   
-  f.length = (int32)stack - (int32)f.where;
+  f.length = (intsys) stack - (intsys) f.where;
   
   return f;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.