Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_data.c
Log Message:
mipspro happiness
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- eet_data.c 21 Apr 2004 06:38:37 -0000 1.15
+++ eet_data.c 29 Apr 2004 01:32:35 -0000 1.16
@@ -169,7 +169,7 @@
/*---*/
-#define SWAP64(x) (unsigned long long)(x) = \
+#define SWAP64(x) (x) = \
((((unsigned long long)(x) & 0x00000000000000ff ) << 56) |\
(((unsigned long long)(x) & 0x000000000000ff00 ) << 40) |\
(((unsigned long long)(x) & 0x0000000000ff0000 ) << 24) |\
@@ -178,12 +178,12 @@
(((unsigned long long)(x) & 0x0000ff0000000000 ) >> 24) |\
(((unsigned long long)(x) & 0x00ff000000000000 ) >> 40) |\
(((unsigned long long)(x) & 0xff00000000000000 ) >> 56))
-#define SWAP32(x) (int)(x) = \
+#define SWAP32(x) (x) = \
((((int)(x) & 0x000000ff ) << 24) |\
(((int)(x) & 0x0000ff00 ) << 8) |\
(((int)(x) & 0x00ff0000 ) >> 8) |\
(((int)(x) & 0xff000000 ) >> 24))
-#define SWAP16(x) (short)(x) = \
+#define SWAP16(x) (x) = \
((((short)(x) & 0x00ff ) << 8) |\
(((short)(x) & 0xff00 ) >> 8))
@@ -880,7 +880,7 @@
{
char *s, *d;
- if ((src + sizeof(char)) > src_end) return -1;
+ if (((char *)src + sizeof(char)) > (char *)src_end) return -1;
s = (char *)src;
d = (char *)dst;
*d = *s;
@@ -908,7 +908,7 @@
{
short *d;
- if ((src + sizeof(short)) > src_end) return -1;
+ if (((char *)src + sizeof(short)) > (char *)src_end) return -1;
memcpy(dst, src, sizeof(short));
d = (short *)dst;
CONV16(*d);
@@ -935,7 +935,7 @@
{
int *d;
- if ((src + sizeof(int)) > src_end) return -1;
+ if (((char *)src + sizeof(int)) > (char *)src_end) return -1;
memcpy(dst, src, sizeof(int));
d = (int *)dst;
CONV32(*d);
@@ -962,7 +962,7 @@
{
unsigned long long *d;
- if ((src + sizeof(unsigned long long)) > src_end) return -1;
+ if (((char *)src + sizeof(unsigned long long)) > (char *)src_end) return -1;
memcpy(dst, src, sizeof(unsigned long long));
d = (unsigned long long *)dst;
CONV64(*d);
@@ -1174,7 +1174,7 @@
free(chnk);
return NULL;
}
- chnk->data = src + 4 + ret1 + ret2;
+ chnk->data = (char *)src + 4 + ret1 + ret2;
chnk->size -= ret2;
return chnk;
}
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs