From 06fa1bfed5aef8d52ee94d09ffc541e0f8d37704 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 30 Nov 2007 11:10:53 +0000 Subject: Fri Nov 30 11:04:00 GMT 2007 Richard W.M. Jones * python/libvir.c, python/libvir.py: Make Python aware that the C bindings module is called cygvirtmod.dll when compiled by CYGWIN. * python/Makefile.am: Remove symlink libvirtmod.dll -> cygvirtmod.dll no longer necessary because of the above. * configure.in: Remove AM_CONDITIONAL(CYGWIN). --- libvir.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'libvir.c') diff --git a/libvir.c b/libvir.c index 0621eb2..9969c80 100644 --- a/libvir.c +++ b/libvir.c @@ -15,7 +15,11 @@ #include "libvirt_wrap.h" #include "libvirt-py.h" +#ifndef __CYGWIN__ extern void initlibvirtmod(void); +#else +extern void initcygvirtmod(void); +#endif PyObject *libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); PyObject *libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); @@ -752,7 +756,12 @@ static PyMethodDef libvirtMethods[] = { }; void -initlibvirtmod(void) +#ifndef __CYGWIN__ +initlibvirtmod +#else +initcygvirtmod +#endif + (void) { static int initialized = 0; @@ -762,7 +771,13 @@ initlibvirtmod(void) virInitialize(); /* intialize the python extension module */ - Py_InitModule((char *) "libvirtmod", libvirtMethods); + Py_InitModule((char *) +#ifndef __CYGWIN__ + "libvirtmod" +#else + "cygvirtmod" +#endif + , libvirtMethods); initialized = 1; } -- cgit