diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2013-09-06 19:02:06 +0100 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2013-11-12 18:02:07 +0000 |
commit | beee4c25014ef440c7625c384f17b561723b12c8 (patch) | |
tree | 9b91d39e2966aeb45ca334af883c5df40e9a15ff | |
parent | 4f9de9e8e211d5586c41aad2f0c5c0e6ff18e13a (diff) | |
download | libvirt-python-v6-beee4c25014ef440c7625c384f17b561723b12c8.tar.gz libvirt-python-v6-beee4c25014ef440c7625c384f17b561723b12c8.tar.xz libvirt-python-v6-beee4c25014ef440c7625c384f17b561723b12c8.zip |
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>
-rw-r--r-- | libvirt-lxc-override.c | 8 | ||||
-rw-r--r-- | libvirt-override.c | 11 | ||||
-rw-r--r-- | libvirt-qemu-override.c | 7 | ||||
-rw-r--r-- | typewrappers.c | 4 |
4 files changed, 6 insertions, 24 deletions
diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index f76ff4b..9b8cd4c 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -9,8 +9,6 @@ * Daniel Veillard <veillard@redhat.com> */ -#include <config.h> - /* Horrible kludge to work around even more horrible name-space pollution via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ @@ -20,9 +18,7 @@ #include <libvirt/libvirt-lxc.h> #include <libvirt/virterror.h> #include "typewrappers.h" -#include "libvirt-lxc.h" -#include "viralloc.h" -#include "virfile.h" +#include "build/libvirt-lxc.h" #ifndef __CYGWIN__ extern void initlibvirtmod_lxc(void); @@ -108,7 +104,7 @@ error: * * ************************************************************************/ static PyMethodDef libvirtLxcMethods[] = { -#include "libvirt-lxc-export.c" +#include "build/libvirt-lxc-export.c" {(char *) "virDomainLxcOpenNamespace", libvirt_lxc_virDomainLxcOpenNamespace, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; diff --git a/libvirt-override.c b/libvirt-override.c index 2e58bf9..10e0daf 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9,8 +9,6 @@ * Daniel Veillard <veillard@redhat.com> */ -#include <config.h> - /* Horrible kludge to work around even more horrible name-space pollution via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ @@ -23,12 +21,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> #include "typewrappers.h" -#include "libvirt.h" -#include "viralloc.h" -#include "virtypedparam.h" -#include "ignore-value.h" -#include "virutil.h" -#include "virstring.h" +#include "build/libvirt.h" #ifndef __CYGWIN__ extern void initlibvirtmod(void); @@ -7224,7 +7217,7 @@ cleanup: * * ************************************************************************/ static PyMethodDef libvirtMethods[] = { -#include "libvirt-export.c" +#include "build/libvirt-export.c" {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL}, diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index 6249031..4008b10 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -9,8 +9,6 @@ * Daniel Veillard <veillard@redhat.com> */ -#include <config.h> - /* Horrible kludge to work around even more horrible name-space pollution via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ @@ -20,8 +18,7 @@ #include <libvirt/libvirt-qemu.h> #include <libvirt/virterror.h> #include "typewrappers.h" -#include "libvirt-qemu.h" -#include "viralloc.h" +#include "build/libvirt-qemu.h" #ifndef __CYGWIN__ extern void initlibvirtmod_qemu(void); @@ -119,7 +116,7 @@ libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, PyObject * * ************************************************************************/ static PyMethodDef libvirtQemuMethods[] = { -#include "libvirt-qemu-export.c" +#include "build/libvirt-qemu-export.c" {(char *) "virDomainQemuMonitorCommand", libvirt_qemu_virDomainQemuMonitorCommand, METH_VARARGS, NULL}, {(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} diff --git a/typewrappers.c b/typewrappers.c index 9ba8790..ba02d6a 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -7,8 +7,6 @@ * Daniel Veillard <veillard@redhat.com> */ -#include <config.h> - /* Horrible kludge to work around even more horrible name-space pollution * via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ @@ -16,8 +14,6 @@ #include "typewrappers.h" -#include "viralloc.h" - #ifndef Py_CAPSULE_H typedef void(*PyCapsule_Destructor)(void *, void *); #endif |