[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-lib/src/libw32dll/wine ext.c,1.11,1.12
From:       Matthias Hopf <mshopf () users ! sourceforge ! net>
Date:       2006-05-22 16:57:38
Message-ID: E1FiDis-00058Y-Aw () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-lib/src/libw32dll/wine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19697/src/libw32dll/wine

Modified Files:
	ext.c 
Log Message:
Fixed gcc warnings (Adrian Schroeter).


Index: ext.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/ext.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ext.c	14 Feb 2006 18:45:37 -0000	1.11
+++ ext.c	22 May 2006 16:57:36 -0000	1.12
@@ -467,14 +467,14 @@
 	return NULL;
     }
 
-    if (type&MEM_RESERVE && (unsigned)address&0xffff) {
-       size += (unsigned)address&0xffff;
-       address = (LPVOID)((unsigned)address & ~0xffff);
+    if (type&MEM_RESERVE && (void*)((unsigned long)address&0xffff)) {
+       size += (unsigned long)address&0xffff;
+       address = (LPVOID)((unsigned long)address & ~0xffff);
     }
     pgsz = sysconf(_SC_PAGESIZE);
-    if (type&MEM_COMMIT && (unsigned)address%pgsz) {
-       size += (unsigned)address%pgsz;
-       address -= (unsigned)address%pgsz;
+    if (type&MEM_COMMIT && (void*)((unsigned long)address%pgsz)) {
+       size += (unsigned long)address%pgsz;
+       address -= (unsigned long)address%pgsz;
     }
 
     if (type&MEM_RESERVE && size<0x10000) size = 0x10000;
@@ -486,12 +486,12 @@
         virt_alloc* str=vm;
         while(str)
         {
-	    if((unsigned)address>=(unsigned)str->address+str->mapping_size)
+	    if((void*)((unsigned long)address)>=(void*)((unsigned \
long)str->address+str->mapping_size))  {
 		str=str->prev;
 		continue;
 	    }
-	    if((unsigned)address+size<=(unsigned)str->address)
+	    if((void*)((unsigned long)address+size)<=(void*)((unsigned long)str->address))
 	    {
 		str=str->prev;
 		continue;
@@ -499,8 +499,8 @@
 	    if(str->state==0)
 	    {
 #warning FIXME
-               if(   ((unsigned)address >= (unsigned)str->address)
-                  && \
((unsigned)address+size<=(unsigned)str->address+str->mapping_size) +               \
if(   (address >= (void*)(unsigned long)str->address) +                  && \
((void*)((unsigned long)address+size)<=(void*)((unsigned \
long)str->address+str->mapping_size))  && (type & MEM_COMMIT))
 		{
 		    close(fd);



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]