1
0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-08-05 16:21:59 +03:00

Update header file includes

We're no longer using automake, so <config.h> files are not
required. Also remove of all libvirt internal util header
files. Reference generated header files in build/ subdir.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-11-12 18:21:46 +00:00
parent 19453b7836
commit 3bfb20266b
4 changed files with 6 additions and 24 deletions

View File

@ -9,8 +9,6 @@
* Daniel Veillard <veillard@redhat.com> * Daniel Veillard <veillard@redhat.com>
*/ */
#include <config.h>
/* Horrible kludge to work around even more horrible name-space pollution /* Horrible kludge to work around even more horrible name-space pollution
via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, via Python.h. That file includes /usr/include/python2.5/pyconfig*.h,
which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ which has over 180 autoconf-style HAVE_* definitions. Shame on them. */
@ -20,9 +18,7 @@
#include <libvirt/libvirt-lxc.h> #include <libvirt/libvirt-lxc.h>
#include <libvirt/virterror.h> #include <libvirt/virterror.h>
#include "typewrappers.h" #include "typewrappers.h"
#include "libvirt-lxc.h" #include "build/libvirt-lxc.h"
#include "viralloc.h"
#include "virfile.h"
#ifndef __CYGWIN__ #ifndef __CYGWIN__
extern void initlibvirtmod_lxc(void); extern void initlibvirtmod_lxc(void);
@ -108,7 +104,7 @@ error:
* * * *
************************************************************************/ ************************************************************************/
static PyMethodDef libvirtLxcMethods[] = { static PyMethodDef libvirtLxcMethods[] = {
#include "libvirt-lxc-export.c" #include "build/libvirt-lxc-export.c"
{(char *) "virDomainLxcOpenNamespace", libvirt_lxc_virDomainLxcOpenNamespace, METH_VARARGS, NULL}, {(char *) "virDomainLxcOpenNamespace", libvirt_lxc_virDomainLxcOpenNamespace, METH_VARARGS, NULL},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

View File

@ -9,8 +9,6 @@
* Daniel Veillard <veillard@redhat.com> * Daniel Veillard <veillard@redhat.com>
*/ */
#include <config.h>
/* Horrible kludge to work around even more horrible name-space pollution /* Horrible kludge to work around even more horrible name-space pollution
via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, via Python.h. That file includes /usr/include/python2.5/pyconfig*.h,
which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ which has over 180 autoconf-style HAVE_* definitions. Shame on them. */
@ -23,12 +21,7 @@
#include <libvirt/libvirt.h> #include <libvirt/libvirt.h>
#include <libvirt/virterror.h> #include <libvirt/virterror.h>
#include "typewrappers.h" #include "typewrappers.h"
#include "libvirt.h" #include "build/libvirt.h"
#include "viralloc.h"
#include "virtypedparam.h"
#include "ignore-value.h"
#include "virutil.h"
#include "virstring.h"
#ifndef __CYGWIN__ #ifndef __CYGWIN__
extern void initlibvirtmod(void); extern void initlibvirtmod(void);
@ -7225,7 +7218,7 @@ cleanup:
* * * *
************************************************************************/ ************************************************************************/
static PyMethodDef libvirtMethods[] = { static PyMethodDef libvirtMethods[] = {
#include "libvirt-export.c" #include "build/libvirt-export.c"
{(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL},
{(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL},
{(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL}, {(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL},

View File

@ -9,8 +9,6 @@
* Daniel Veillard <veillard@redhat.com> * Daniel Veillard <veillard@redhat.com>
*/ */
#include <config.h>
/* Horrible kludge to work around even more horrible name-space pollution /* Horrible kludge to work around even more horrible name-space pollution
via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, via Python.h. That file includes /usr/include/python2.5/pyconfig*.h,
which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ which has over 180 autoconf-style HAVE_* definitions. Shame on them. */
@ -20,8 +18,7 @@
#include <libvirt/libvirt-qemu.h> #include <libvirt/libvirt-qemu.h>
#include <libvirt/virterror.h> #include <libvirt/virterror.h>
#include "typewrappers.h" #include "typewrappers.h"
#include "libvirt-qemu.h" #include "build/libvirt-qemu.h"
#include "viralloc.h"
#ifndef __CYGWIN__ #ifndef __CYGWIN__
extern void initlibvirtmod_qemu(void); extern void initlibvirtmod_qemu(void);
@ -119,7 +116,7 @@ libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, PyObject
* * * *
************************************************************************/ ************************************************************************/
static PyMethodDef libvirtQemuMethods[] = { static PyMethodDef libvirtQemuMethods[] = {
#include "libvirt-qemu-export.c" #include "build/libvirt-qemu-export.c"
{(char *) "virDomainQemuMonitorCommand", libvirt_qemu_virDomainQemuMonitorCommand, METH_VARARGS, NULL}, {(char *) "virDomainQemuMonitorCommand", libvirt_qemu_virDomainQemuMonitorCommand, METH_VARARGS, NULL},
{(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL}, {(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}

View File

@ -7,8 +7,6 @@
* Daniel Veillard <veillard@redhat.com> * Daniel Veillard <veillard@redhat.com>
*/ */
#include <config.h>
/* Horrible kludge to work around even more horrible name-space pollution /* Horrible kludge to work around even more horrible name-space pollution
* via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, * via Python.h. That file includes /usr/include/python2.5/pyconfig*.h,
* which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */
@ -16,8 +14,6 @@
#include "typewrappers.h" #include "typewrappers.h"
#include "viralloc.h"
#ifndef Py_CAPSULE_H #ifndef Py_CAPSULE_H
typedef void(*PyCapsule_Destructor)(void *, void *); typedef void(*PyCapsule_Destructor)(void *, void *);
#endif #endif