Enlightenment CVS committal
Author : davemds
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
* fix compiler warnings
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- edje_util.c 7 Jun 2008 10:06:14 -0000 1.108
+++ edje_util.c 13 Jul 2008 13:55:43 -0000 1.109
@@ -892,11 +892,11 @@
if (mw < 0) mw = 0;
if (mh < 0) mh = 0;
if (mw > 0)
- evas_object_data_set(obj, "\377 edje.minw", (void *)mw);
+ evas_object_data_set(obj, "\377 edje.minw", (void *)(long)mw);
else
evas_object_data_del(obj, "\377 edje.minw");
if (mh > 0)
- evas_object_data_set(obj, "\377 edje.minh", (void *)mh);
+ evas_object_data_set(obj, "\377 edje.minh", (void *)(long)mh);
else
evas_object_data_del(obj, "\377 edje.minh");
@@ -926,11 +926,11 @@
mw = maxw;
mh = maxh;
if (mw >= 0)
- evas_object_data_set(obj, "\377 edje.maxw", (void *)mw);
+ evas_object_data_set(obj, "\377 edje.maxw", (void *)(long)mw);
else
evas_object_data_del(obj, "\377 edje.maxw");
if (mh >= 0)
- evas_object_data_set(obj, "\377 edje.maxh", (void *)mh);
+ evas_object_data_set(obj, "\377 edje.maxh", (void *)(long)mh);
else
evas_object_data_del(obj, "\377 edje.maxh");
@@ -966,15 +966,15 @@
mw = aw;
mh = ah;
if (mc > 0)
- evas_object_data_set(obj, "\377 edje.aspm", (void *)mc);
+ evas_object_data_set(obj, "\377 edje.aspm", (void *)(long)mc);
else
evas_object_data_del(obj, "\377 edje.aspm");
if (mw > 0)
- evas_object_data_set(obj, "\377 edje.aspw", (void *)mw);
+ evas_object_data_set(obj, "\377 edje.aspw", (void *)(long)mw);
else
evas_object_data_del(obj, "\377 edje.aspw");
if (mh > 0)
- evas_object_data_set(obj, "\377 edje.asph", (void *)mh);
+ evas_object_data_set(obj, "\377 edje.asph", (void *)(long)mh);
else
evas_object_data_del(obj, "\377 edje.asph");
@@ -2064,13 +2064,13 @@
{
int w1, h1, w2, h2, am, aw, ah;
- w1 = (int)evas_object_data_get(obj_swallow, "\377 edje.minw");
- h1 = (int)evas_object_data_get(obj_swallow, "\377 edje.minh");
- w2 = (int)evas_object_data_get(obj_swallow, "\377 edje.maxw");
- h2 = (int)evas_object_data_get(obj_swallow, "\377 edje.maxh");
- am = (int)evas_object_data_get(obj_swallow, "\377 edje.aspm");
- aw = (int)evas_object_data_get(obj_swallow, "\377 edje.aspw");
- ah = (int)evas_object_data_get(obj_swallow, "\377 edje.asph");
+ w1 = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.minw");
+ h1 = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.minh");
+ w2 = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.maxw");
+ h2 = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.maxh");
+ am = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.aspm");
+ aw = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.aspw");
+ ah = (int)(long)evas_object_data_get(obj_swallow, "\377 edje.asph");
rp->swallow_params.min.w = w1;
rp->swallow_params.min.h = h1;
if (w2 > 0) rp->swallow_params.max.w = w2;
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
