[libvirt-php][PATCH 09/11] vncfunc: Drop include of libvirt-php.h

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

The point is, libvirt-php.c uses vnc functions implemented in
vncfunc.c, but for some weird historical reasons, it was
vncfunc.c who included libvirt-php.h.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 src/libvirt-php.h | 21 ---------------------
 src/vncfunc.c     | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/libvirt-php.h b/src/libvirt-php.h
index 6b6df21..6b34581 100644
--- a/src/libvirt-php.h
+++ b/src/libvirt-php.h
@@ -194,27 +194,6 @@ typedef struct tVMNetwork {
     char *model;
 } tVMNetwork;
 
-#ifndef EXTWIN
-typedef struct tBMPFile {
-    uint32_t filesz;
-    uint16_t creator1;
-    uint16_t creator2;
-    uint32_t bmp_offset;
-
-    uint32_t header_sz;
-    int32_t height;
-    int32_t width;
-    uint16_t nplanes;
-    uint16_t bitspp;
-    uint32_t compress_type;
-    uint32_t bmp_bytesz;
-    int32_t hres;
-    int32_t vres;
-    uint32_t ncolors;
-    uint32_t nimpcolors;
-} tBMPFile;
-#endif
-
 /* Libvirt-php types */
 typedef struct _php_libvirt_connection {
     virConnectPtr conn;
diff --git a/src/vncfunc.c b/src/vncfunc.c
index 447881e..cb98341 100644
--- a/src/vncfunc.c
+++ b/src/vncfunc.c
@@ -7,8 +7,19 @@
  *   Michal Novotny <minovotn@xxxxxxxxxx>
  */
 
+#include <config.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include "vncfunc.h"
-#include "libvirt-php.h"
 #include "util.h"
 #include "sockets.h"
 
@@ -44,6 +55,25 @@ typedef struct tServerFBParams {
     unsigned char *desktopName;
 } tServerFBParams;
 
+typedef struct tBMPFile {
+    uint32_t filesz;
+    uint16_t creator1;
+    uint16_t creator2;
+    uint32_t bmp_offset;
+
+    uint32_t header_sz;
+    int32_t height;
+    int32_t width;
+    uint16_t nplanes;
+    uint16_t bitspp;
+    uint32_t compress_type;
+    uint32_t bmp_bytesz;
+    int32_t hres;
+    int32_t vres;
+    uint32_t ncolors;
+    uint32_t nimpcolors;
+} tBMPFile;
+
 /*
  * Private function name:   vnc_write_client_version
  * Since version:           0.4.3
-- 
2.8.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list