[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] PATCH: Fix mingw32 build



On Thu, May 28, 2009 at 05:37:14PM +0100, Daniel P. Berrange wrote:
> On Win32/mingw32 the name 'interface' is #defined to the COM_interface
> struct. Needless to say, libvirt thus fails to build in spectacular ways.
> This patch does s/interface/iface/  on all variables. It also fixes
> bugs in the qemud/Makefile.am and tests/testutils.h files
> 
>  include/libvirt/libvirt.h    |   18 +++---
>  include/libvirt/libvirt.h.in |   18 +++---
>  qemud/Makefile.am            |    6 +-
>  qemud/remote.c               |   82 ++++++++++++++---------------
>  qemud/remote_protocol.c      |   14 ++---
>  qemud/remote_protocol.h      |   14 ++---
>  qemud/remote_protocol.x      |   14 ++---
>  src/datatypes.c              |   36 ++++++------
>  src/datatypes.h              |    2 
>  src/driver.h                 |    8 +-
>  src/libvirt.c                |  120 +++++++++++++++++++++----------------------
>  src/remote_internal.c        |   56 ++++++++++----------
>  tests/testutils.c            |   10 +++
>  13 files changed, 206 insertions(+), 192 deletions(-)

  Okidoc,

>  static virStoragePoolPtr
> Index: tests/testutils.c
> ===================================================================
> RCS file: /data/cvs/libvirt/tests/testutils.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 testutils.c
> --- tests/testutils.c	21 May 2009 14:22:51 -0000	1.28
> +++ tests/testutils.c	28 May 2009 16:32:54 -0000
> @@ -18,7 +18,9 @@
>  #ifndef WIN32
>  #include <sys/wait.h>
>  #endif
> +#ifdef HAVE_REGEX_H
>  #include <regex.h>
> +#endif
>  #include <unistd.h>
>  #include <string.h>
>  #include <fcntl.h>
> @@ -460,6 +462,7 @@ cleanup:
>  }
>  
>  
> +#ifdef HAVE_REGEX_H
>  int virtTestClearLineRegex(const char *pattern,
>                             char *str)
>  {
> @@ -503,3 +506,10 @@ int virtTestClearLineRegex(const char *p
>  
>      return 0;
>  }
> +#else
> +int virtTestClearLineRegex(const char *pattern ATTRIBUTE_UNUSED,
> +                           char *str ATTRIBUTE_UNUSED)
> +{
> +    return 0;
> +}
> +#endif

  Hum, mingw doesn't export any regexp ? But right now dropping this
is fine,

  ACK,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel veillard com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]