Hi, Jim and Dan How about this? src/domain_conf.c | 1 + src/domain_conf.h | 6 +++--- src/network_conf.c | 1 + src/qemu_driver.c | 32 ++++++++++++++++---------------- src/util.c | 4 ++-- src/virsh.c | 3 +++ tests/testutilsxen.c | 2 ++ 7 files changed, 28 insertions(+), 21 deletions(-) Thanks Atsushi SAKAI Jim Meyering <jim@meyering.net> wrote:
Atsushi SAKAI <sakaia@jp.fujitsu.com> wrote:
Hi, Dan
Thank you for commenting it. Without WITH_QEMU, following errors are appeared. === In file included from test.c:44: domain_conf.h:447: error: syntax error before '&' token domain_conf.h:447: warning: no semicolon at end of struct or union domain_conf.h:448: error: syntax error before '&' token domain_conf.h:449: error: syntax error before '&' token domain_conf.h:458: error: syntax error before ':' token domain_conf.h:459: error: syntax error before ':' token domain_conf.h:468: error: syntax error before '}' token ...
+#ifdef WITH_QEMU int stdin; int stdout; int stderr; +#endif
Instead of an ifdef, I suggest renaming those three variables. Then their names won't conflict with the names from stdio.h.
Please make that var-renaming change a separate change set.