Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: ecore_x_window_prop.c Log Message: 64bit fix =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_window_prop.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- ecore_x_window_prop.c 25 Jun 2005 00:15:19 -0000 1.72 +++ ecore_x_window_prop.c 16 Aug 2005 08:40:55 -0000 1.73 @@ -132,9 +132,9 @@ if (num) *num = 0; if (data) - *data = NULL; + *data = NULL; else /* we can't store the retrieved data, so just return */ - return 0; + return 0; if (!win) win = DefaultRootWindow(_ecore_x_disp); @@ -147,14 +147,14 @@ if (size != size_ret || !num_ret) { XFree(prop_ret); - return 0; + return 0; } - + if (!(*data = malloc(num_ret * size / 8))) { - XFree(prop_ret); - return 0; + XFree(prop_ret); + return 0; } - + switch (size) { case 8: for (i = 0; i < num_ret; i++) @@ -162,11 +162,11 @@ break; case 16: for (i = 0; i < num_ret; i++) - ((uint16_t *) *data)[i] = ((uint16_t *) prop_ret)[i]; + ((unsigned short *) *data)[i] = ((unsigned short *) prop_ret)[i]; break; case 32: for (i = 0; i < num_ret; i++) - ((uint32_t *) *data)[i] = ((uint32_t *) prop_ret)[i]; + ((unsigned int *) *data)[i] = ((unsigned long *) prop_ret)[i]; break; } ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs