]> xenbits.xensource.com Git - libvirt.git/commitdiff
python: always include config.h first
authorEric Blake <eblake@redhat.com>
Tue, 20 Mar 2012 22:44:39 +0000 (16:44 -0600)
committerEric Blake <eblake@redhat.com>
Tue, 20 Mar 2012 22:54:39 +0000 (16:54 -0600)
On RHEL 5.7, I got this compilation failure:

In file included from /usr/include/python2.4/pyport.h:98,
                 from /usr/include/python2.4/Python.h:55,
                 from libvirt.c:3:
../gnulib/lib/time.h:468: error: expected ';', ',' or ')' before '__timer'

Turns out that our '#define restrict __restrict' from config.h wasn't
being picked up.  Gnulib _requires_ that all .c files include <config.h>
first, otherwise the gnulib header overrides tend to misbehave.

Problem introduced by patch c700613b8.

* python/generator.py (buildStubs): Include <config.h> first.

python/generator.py

index 98072f0a9f98f3098ddce0b297ae5a079e4613ab..e641c3187638b03e671fa3321e54430712c21bbb 100755 (executable)
@@ -757,7 +757,8 @@ def buildStubs(module):
     export.write("/* Generated */\n\n")
 
     wrapper = open(wrapper_file, "w")
-    wrapper.write("/* Generated */\n\n")
+    wrapper.write("/* Generated by generator.py */\n\n")
+    wrapper.write("#include <config.h>\n")
     wrapper.write("#include <Python.h>\n")
     wrapper.write("#include <libvirt/" + module + ".h>\n")
     wrapper.write("#include \"typewrappers.h\"\n")