From a743f3080de62190d0a920dfa42d5b07e5934d1e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Jun 2012 15:49:06 +0100
Subject: Ensure #include <config.h> occurs in every C file.

(cherry picked from commit 1d17a6e9d8f434f952f3c171b5a81ca6b916fa1f)
---
 erlang/erl-guestfs-proto.c         | 2 ++
 generator/generator_bindtests.ml   | 2 ++
 generator/generator_erlang.ml      | 2 ++
 generator/generator_fish.ml        | 2 ++
 generator/generator_gobject.ml     | 2 ++
 generator/generator_java.ml        | 2 ++
 generator/generator_perl.ml        | 2 ++
 generator/generator_tests_c_api.ml | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/erlang/erl-guestfs-proto.c b/erlang/erl-guestfs-proto.c
index d1eb48b9..241a1940 100644
--- a/erlang/erl-guestfs-proto.c
+++ b/erlang/erl-guestfs-proto.c
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/generator/generator_bindtests.ml b/generator/generator_bindtests.ml
index cf4210a8..37ab5735 100644
--- a/generator/generator_bindtests.ml
+++ b/generator/generator_bindtests.ml
@@ -33,6 +33,8 @@ let rec generate_bindtests () =
   generate_header CStyle LGPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/generator/generator_erlang.ml b/generator/generator_erlang.ml
index 0248770e..3c783e56 100644
--- a/generator/generator_erlang.ml
+++ b/generator/generator_erlang.ml
@@ -142,6 +142,8 @@ and generate_erlang_c () =
   generate_header CStyle GPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/generator/generator_fish.ml b/generator/generator_fish.ml
index 84f2208d..3c4021a9 100644
--- a/generator/generator_fish.ml
+++ b/generator/generator_fish.ml
@@ -960,6 +960,8 @@ and generate_fish_prep_options_c () =
   generate_header CStyle GPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include <stdio.h>
 
 #include \"fish.h\"
diff --git a/generator/generator_gobject.ml b/generator/generator_gobject.ml
index 9e75f35b..44212c15 100644
--- a/generator/generator_gobject.ml
+++ b/generator/generator_gobject.ml
@@ -287,6 +287,8 @@ let generate_gobject_header_methods () =
 
 let generate_gobject_c_static () =
   pr "
+#include <config.h>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <guestfs.h>
diff --git a/generator/generator_java.ml b/generator/generator_java.ml
index 7f138910..5a2afe94 100644
--- a/generator/generator_java.ml
+++ b/generator/generator_java.ml
@@ -314,6 +314,8 @@ and generate_java_c () =
   generate_header CStyle LGPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/generator/generator_perl.ml b/generator/generator_perl.ml
index 31f1418d..60ec975d 100644
--- a/generator/generator_perl.ml
+++ b/generator/generator_perl.ml
@@ -35,6 +35,8 @@ let rec generate_perl_xs () =
   generate_header CStyle LGPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include \"EXTERN.h\"
 #include \"perl.h\"
 #include \"XSUB.h\"
diff --git a/generator/generator_tests_c_api.ml b/generator/generator_tests_c_api.ml
index 34df5786..b6abd73d 100644
--- a/generator/generator_tests_c_api.ml
+++ b/generator/generator_tests_c_api.ml
@@ -33,6 +33,8 @@ let rec generate_tests () =
   generate_header CStyle GPLv2plus;
 
   pr "\
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-- 
cgit