changeset 846:dbcfa04ee4db

fix 64bit mode
author tkaito
date Fri, 04 Jun 2010 09:01:00 +0900
parents 1e3b67117ad9
children 8c78d15ea999 df80613f1e1a
files Renderer/Engine/lindaapi.cc Renderer/Engine/task/DrawSpan.cc
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/lindaapi.cc	Thu Jun 03 02:55:29 2010 +0900
+++ b/Renderer/Engine/lindaapi.cc	Fri Jun 04 09:01:00 2010 +0900
@@ -568,7 +568,7 @@
             p = r_end->next; r_end = p; p->next = NULL;
         }
         p->mode = '?';
-        p->seq = (int)p;  // 構造体のアドレスで識別
+        p->seq = (unsigned long)p;  // 構造体のアドレスで識別
         p->callback = callback;
         p->obj = obj;
         PSX_Debug(("psx_queue: seq %d reply %x p %x r_end %x",seq,reply,p,r_end));
@@ -580,10 +580,10 @@
     q_end->command[LINDA_ID_OFFSET]   = id >> 8;
     q_end->command[LINDA_ID_OFFSET+1] = id & 0xff;
 
-    q_end->command[LINDA_SEQ_OFFSET]   = ((int)p>>24) & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+1] = ((int)p>>16) & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+2] = ((int)p>>8)  & 0xff;
-    q_end->command[LINDA_SEQ_OFFSET+3] = ((int)p)     & 0xff;
+    q_end->command[LINDA_SEQ_OFFSET]   = ((unsigned long)p>>24) & 0xff;
+    q_end->command[LINDA_SEQ_OFFSET+1] = ((unsigned long)p>>16) & 0xff;
+    q_end->command[LINDA_SEQ_OFFSET+2] = ((unsigned long)p>>8)  & 0xff;
+    q_end->command[LINDA_SEQ_OFFSET+3] = ((unsigned long)p)     & 0xff;
     
     q_end->command[LINDA_DATA_LENGTH_OFFSET]   = (size>>24) & 0xff;
     q_end->command[LINDA_DATA_LENGTH_OFFSET+1] = (size>>16) & 0xff;
@@ -596,7 +596,7 @@
     qsize++;
     if (data && size>0)
         memcpy(q_end->command+LINDA_HEADER_SIZE, data, size);
-    return((int)p);
+    return((unsigned long)p);
 }
 
 /*-------------------------------------------------------------------/
--- a/Renderer/Engine/task/DrawSpan.cc	Thu Jun 03 02:55:29 2010 +0900
+++ b/Renderer/Engine/task/DrawSpan.cc	Fri Jun 04 09:01:00 2010 +0900
@@ -479,7 +479,7 @@
 {
 
   //get_param(5) is spack->info.size
-  if ((int)smanager->get_param(5) == 0) {
+  if ((long)smanager->get_param(5) == 0) {
 
     int rangex_start = (long)smanager->get_param(2);
     int rangex_end   = (long)smanager->get_param(3);