summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-09-09 09:59:19 +0100
committerDaniel P. Berrange <berrange@redhat.com>2013-09-09 16:42:01 +0100
commit7b7d750f87a7111e2e405f5de578e6bbaed7e1a9 (patch)
treeea8d7b00e940bfdded7406647576627a165ffcc8
parent5b08fa58ca8c997eaabfb199381f6ea10d1ce1a7 (diff)
downloadlibvirt-python-split-7b7d750f87a7111e2e405f5de578e6bbaed7e1a9.tar.gz
libvirt-python-split-7b7d750f87a7111e2e405f5de578e6bbaed7e1a9.tar.xz
libvirt-python-split-7b7d750f87a7111e2e405f5de578e6bbaed7e1a9.zip
Update header file includes
Remove use of all libvirt 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.c6
-rw-r--r--libvirt-override.c9
-rw-r--r--libvirt-qemu-override.c5
-rw-r--r--typewrappers.c2
4 files changed, 6 insertions, 16 deletions
diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c
index 03e3771..6f88d85 100644
--- a/libvirt-lxc-override.c
+++ b/libvirt-lxc-override.c
@@ -18,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);
@@ -106,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 00d8e4d..246a15b 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -21,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);
@@ -7171,7 +7166,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 *) "virConnectGetLibVersion", libvirt_virConnectGetLibVersion, METH_VARARGS, NULL},
diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c
index 1707308..fde5102 100644
--- a/libvirt-qemu-override.c
+++ b/libvirt-qemu-override.c
@@ -18,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);
@@ -117,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 91c32fc..a960af8 100644
--- a/typewrappers.c
+++ b/typewrappers.c
@@ -14,8 +14,6 @@
#include "typewrappers.h"
-#include "viralloc.h"
-
#ifndef Py_CAPSULE_H
typedef void(*PyCapsule_Destructor)(void *, void *);
#endif