From 649b990bbfe4127841d73ae86c92cc902ec56e93 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Nov 2010 23:17:37 +0000 Subject: [PATCH] Be less verbose in the macros defending typedefs in . This updates commit 4d59e271046f2b5f0d9b1730cd23425fd631c76c. --- generator/generator_c.ml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/generator/generator_c.ml b/generator/generator_c.ml index 7ebd846..caf73c3 100644 --- a/generator/generator_c.ml +++ b/generator/generator_c.ml @@ -366,8 +366,8 @@ extern \"C\" { #include /* The handle. */ -#ifndef GUESTFS_TYPEDEF_GUESTFS_H -#define GUESTFS_TYPEDEF_GUESTFS_H 1 +#ifndef GUESTFS_TYPEDEF_H +#define GUESTFS_TYPEDEF_H 1 typedef struct guestfs_h guestfs_h; #endif @@ -380,13 +380,13 @@ extern const char *guestfs_last_error (guestfs_h *g); #define LIBGUESTFS_HAVE_LAST_ERRNO 1 extern int guestfs_last_errno (guestfs_h *g); -#ifndef GUESTFS_TYPEDEF_GUESTFS_ERROR_HANDLER_CB -#define GUESTFS_TYPEDEF_GUESTFS_ERROR_HANDLER_CB 1 +#ifndef GUESTFS_TYPEDEF_ERROR_HANDLER_CB +#define GUESTFS_TYPEDEF_ERROR_HANDLER_CB 1 typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *opaque, const char *msg); #endif -#ifndef GUESTFS_TYPEDEF_GUESTFS_ABORT_CB -#define GUESTFS_TYPEDEF_GUESTFS_ABORT_CB 1 +#ifndef GUESTFS_TYPEDEF_ABORT_CB +#define GUESTFS_TYPEDEF_ABORT_CB 1 typedef void (*guestfs_abort_cb) (void) __attribute__((__noreturn__)); #endif @@ -397,28 +397,28 @@ 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. */ -#ifndef GUESTFS_TYPEDEF_GUESTFS_LOG_MESSAGE_CB -#define GUESTFS_TYPEDEF_GUESTFS_LOG_MESSAGE_CB 1 +#ifndef GUESTFS_TYPEDEF_LOG_MESSAGE_CB +#define GUESTFS_TYPEDEF_LOG_MESSAGE_CB 1 typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *opaque, char *buf, int len); #endif -#ifndef GUESTFS_TYPEDEF_GUESTFS_SUBPROCESS_QUIT_CB -#define GUESTFS_TYPEDEF_GUESTFS_SUBPROCESS_QUIT_CB 1 +#ifndef GUESTFS_TYPEDEF_SUBPROCESS_QUIT_CB +#define GUESTFS_TYPEDEF_SUBPROCESS_QUIT_CB 1 typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *opaque); #endif -#ifndef GUESTFS_TYPEDEF_GUESTFS_LAUNCH_DONE_CB -#define GUESTFS_TYPEDEF_GUESTFS_LAUNCH_DONE_CB 1 +#ifndef GUESTFS_TYPEDEF_LAUNCH_DONE_CB +#define GUESTFS_TYPEDEF_LAUNCH_DONE_CB 1 typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *opaque); #endif -#ifndef GUESTFS_TYPEDEF_GUESTFS_CLOSE_CB -#define GUESTFS_TYPEDEF_GUESTFS_CLOSE_CB 1 +#ifndef GUESTFS_TYPEDEF_CLOSE_CB +#define GUESTFS_TYPEDEF_CLOSE_CB 1 typedef void (*guestfs_close_cb) (guestfs_h *g, void *opaque); #endif -#ifndef GUESTFS_TYPEDEF_GUESTFS_PROGRESS_CB -#define GUESTFS_TYPEDEF_GUESTFS_PROGRESS_CB 1 +#ifndef GUESTFS_TYPEDEF_PROGRESS_CB +#define GUESTFS_TYPEDEF_PROGRESS_CB 1 typedef void (*guestfs_progress_cb) (guestfs_h *g, void *opaque, int proc_nr, int serial, uint64_t position, uint64_t total); #endif -- 1.8.3.1