X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs.h;h=1c7ee04eb595212ec20a7a564458ae31bf2b7bc4;hb=275b5fa5608dbaf9ff69d1a4e6a2e728081a101f;hp=5b8ad0974da032167572d852b117f2f4a319b51b;hpb=d89955fde9806d1125e03cc3caddea12df9d0cfa;p=libguestfs.git

diff --git a/src/guestfs.h b/src/guestfs.h
index 5b8ad09..1c7ee04 100644
--- a/src/guestfs.h
+++ b/src/guestfs.h
@@ -43,25 +43,27 @@ extern void guestfs_close (guestfs_h *g);
 /*--- Error handling ---*/
 extern const char *guestfs_last_error (guestfs_h *g);
 
-typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *data, const char *msg);
+typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *opaque, const char *msg);
 typedef void (*guestfs_abort_cb) (void) __attribute__((__noreturn__));
 
-extern void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *data);
-extern guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **data_rtn);
+extern void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *opaque);
+extern guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **opaque_rtn);
 
 extern void guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb);
 extern guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g);
 
 /*--- Events ---*/
-typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *data, char *buf, int len);
-typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *data);
-typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *data);
+typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *opaque, char *buf, int len);
+typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *opaque);
+typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *opaque);
 
 extern void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_cb cb, void *opaque);
 extern void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque);
 extern void guestfs_set_launch_done_callback (guestfs_h *g, guestfs_launch_done_cb cb, void *opaque);
 
 /*--- Structures and actions ---*/
+#include <stdint.h>
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <guestfs-structs.h>
 #include <guestfs-actions.h>