From 096f341714ee7d1575c93d437a8085821aa88d23 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Nov 2010 23:18:57 +0000 Subject: [PATCH] Don't need to include XDR headers in . Include the XDR headers in the internal guestfs-internal.h instead. This is knock-on effects to several other source files which were implicitly relying on indirectly loaded headers. --- fish/copy.c | 1 + fish/progress.c | 1 + fish/time.c | 1 + generator/generator_c.ml | 3 +-- generator/generator_fish.ml | 2 ++ src/guestfs-internal.h | 3 +++ 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fish/copy.c b/fish/copy.c index f5edad1..9f3f3df 100644 --- a/fish/copy.c +++ b/fish/copy.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/fish/progress.c b/fish/progress.c index f196786..27dfbec 100644 --- a/fish/progress.c +++ b/fish/progress.c @@ -22,6 +22,7 @@ #include #include #include +#include #include diff --git a/fish/time.c b/fish/time.c index 48cf100..931403f 100644 --- a/fish/time.c +++ b/fish/time.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "fish.h" diff --git a/generator/generator_c.ml b/generator/generator_c.ml index caf73c3..0194e0c 100644 --- a/generator/generator_c.ml +++ b/generator/generator_c.ml @@ -360,10 +360,9 @@ and generate_guestfs_h () = extern \"C\" { #endif +#include #include #include -#include -#include /* The handle. */ #ifndef GUESTFS_TYPEDEF_H diff --git a/generator/generator_fish.ml b/generator/generator_fish.ml index f59c520..0c81dfc 100644 --- a/generator/generator_fish.ml +++ b/generator/generator_fish.ml @@ -909,6 +909,8 @@ and generate_fish_prep_options_c () = generate_header CStyle GPLv2plus; pr "\ +#include + #include \"fish.h\" #include \"prepopts.h\" diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index f8b3e94..6dbbeec 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -19,6 +19,9 @@ #ifndef GUESTFS_INTERNAL_H_ #define GUESTFS_INTERNAL_H_ +#include +#include + #ifdef HAVE_PCRE #include #endif -- 1.8.3.1