Author: dmeyer
Date: Mon Feb 12 20:19:33 2007
New Revision: 2485
Modified:
trunk/base/src/extensions/inotify/inotify.c
trunk/imlib2/src/font.c
trunk/imlib2/src/image.c
Log:
64 bit patch by Mathias Weber
Modified: trunk/base/src/extensions/inotify/inotify.c
==============================================================================
--- trunk/base/src/extensions/inotify/inotify.c (original)
+++ trunk/base/src/extensions/inotify/inotify.c Mon Feb 12 20:19:33 2007
@@ -46,7 +46,7 @@
int fd = inotify_init();
if (fd == -1)
perror("inotify_init");
- return Py_BuildValue("l", fd);
+ return Py_BuildValue("i", fd);
}
PyObject *add_watch(PyObject *self, PyObject *args)
@@ -58,7 +58,7 @@
if (!PyArg_ParseTuple(args, "isi", &fd, &name, &mask))
return NULL;
- return Py_BuildValue("l", inotify_add_watch(fd, name, mask));
+ return Py_BuildValue("i", inotify_add_watch(fd, name, mask));
}
PyObject *rm_watch(PyObject *self, PyObject *args)
@@ -69,7 +69,7 @@
if (!PyArg_ParseTuple(args, "ii", &fd, &wd))
return NULL;
- return Py_BuildValue("l", inotify_rm_watch(fd, wd));
+ return Py_BuildValue("i", inotify_rm_watch(fd, wd));
}
Modified: trunk/imlib2/src/font.c
==============================================================================
--- trunk/imlib2/src/font.c (original)
+++ trunk/imlib2/src/font.c Mon Feb 12 20:19:33 2007
@@ -95,13 +95,13 @@
{
imlib_context_set_font(self->font);
if (!strcmp(name, "descent"))
- return Py_BuildValue("l", imlib_get_font_descent());
+ return Py_BuildValue("i", imlib_get_font_descent());
else if (!strcmp(name, "ascent"))
- return Py_BuildValue("l", imlib_get_font_ascent());
+ return Py_BuildValue("i", imlib_get_font_ascent());
else if (!strcmp(name, "max_ascent"))
- return Py_BuildValue("l", imlib_get_maximum_font_ascent());
+ return Py_BuildValue("i", imlib_get_maximum_font_ascent());
else if (!strcmp(name, "max_descent"))
- return Py_BuildValue("l", imlib_get_maximum_font_descent());
+ return Py_BuildValue("i", imlib_get_maximum_font_descent());
return Py_FindMethod(Font_PyObject_methods, (PyObject *)self, name);
}
Modified: trunk/imlib2/src/image.c
==============================================================================
--- trunk/imlib2/src/image.c (original)
+++ trunk/imlib2/src/image.c Mon Feb 12 20:19:33 2007
@@ -741,11 +741,11 @@
{
imlib_context_set_image(self->image);
if (!strcmp(name, "width"))
- return Py_BuildValue("l", imlib_image_get_width());
+ return Py_BuildValue("i", imlib_image_get_width());
else if (!strcmp(name, "height"))
- return Py_BuildValue("l", imlib_image_get_height());
+ return Py_BuildValue("i", imlib_image_get_height());
else if (!strcmp(name, "has_alpha"))
- return Py_BuildValue("l", imlib_image_has_alpha());
+ return Py_BuildValue("i", imlib_image_has_alpha());
else if (!strcmp(name, "rowstride"))
return Py_BuildValue("l", imlib_image_get_width() * 4);
else if (!strcmp(name, "format"))
-------------------------------------------------------------------------
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
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
