summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-01-18 10:37:47 +0000
committerRichard W.M. Jones <rjones@redhat.com>2012-01-18 16:28:31 +0000
commit607784df926aeb9293dbeb346f45d93907c7ffa2 (patch)
tree7f68d97298a84fa112fb7dde39f738a4e5c39063
parentdb90770ec5e867cc120a9753bf928f081002c2e7 (diff)
downloadlibguestfs-607784df926aeb9293dbeb346f45d93907c7ffa2.tar.gz
libguestfs-607784df926aeb9293dbeb346f45d93907c7ffa2.tar.xz
libguestfs-607784df926aeb9293dbeb346f45d93907c7ffa2.zip
ocaml: Don't include guestfs-internal.h directly.
However since the OCaml bindings use guestfs_safe_strdup and guestfs_safe_memdup we need to export those two (in the private functions section) from <guestfs.h>.
-rw-r--r--generator/generator_c.ml2
-rw-r--r--ocaml/guestfs_c.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/generator/generator_c.ml b/generator/generator_c.ml
index c6962f51..e9fe89b6 100644
--- a/generator/generator_c.ml
+++ b/generator/generator_c.ml
@@ -625,6 +625,8 @@ extern void *guestfs_next_private (guestfs_h *g, const char **key_rtn);
extern void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes);
extern void *guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s);
extern const char *guestfs_tmpdir (void);
+extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
+extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
#ifdef GUESTFS_PRIVATE_FOR_EACH_DISK
extern int guestfs___for_each_disk (guestfs_h *g, virDomainPtr dom, int (*)(guestfs_h *g, const char *filename, const char *format, int readonly, void *data), void *data);
#endif
diff --git a/ocaml/guestfs_c.h b/ocaml/guestfs_c.h
index a374bf26..2bcd577e 100644
--- a/ocaml/guestfs_c.h
+++ b/ocaml/guestfs_c.h
@@ -19,8 +19,6 @@
#ifndef GUESTFS_OCAML_C_H
#define GUESTFS_OCAML_C_H
-#include "guestfs-internal.h"
-
#define Guestfs_val(v) (*((guestfs_h **)Data_custom_val(v)))
extern void ocaml_guestfs_raise_error (guestfs_h *g, const char *func)
Noreturn;