summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2014-03-25 16:32:16 +0100
committerChristophe Fergeau <cfergeau@redhat.com>2014-04-16 16:47:55 +0200
commit06a99ce30b113566b40453e42752d45582b3a9f7 (patch)
tree8f4da43ba5be7096412d7eb96e41cad13a7ed9ad
parentef14521ac5218ca876e29173470fdb41a0cc821c (diff)
downloadspice-protocol-06a99ce30b113566b40453e42752d45582b3a9f7.tar.gz
spice-protocol-06a99ce30b113566b40453e42752d45582b3a9f7.tar.xz
spice-protocol-06a99ce30b113566b40453e42752d45582b3a9f7.zip
marshaller: Use #include <> for headers in $srcdir/common
Since the (de)marshallers are now generated in $builddir and not in $srcdir, when these generated files include a file located in $srcdir/common, the compiler will find them thanks to a -I directive, so it makes more sense to use <> rather than "" when including them.
-rw-r--r--python_modules/demarshal.py2
-rwxr-xr-xspice_codegen.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/python_modules/demarshal.py b/python_modules/demarshal.py
index 794cd25..b7e51dc 100644
--- a/python_modules/demarshal.py
+++ b/python_modules/demarshal.py
@@ -1250,7 +1250,7 @@ def write_includes(writer):
writer.writeln("#include <stdio.h>")
writer.writeln("#include <spice/protocol.h>")
writer.writeln("#include <spice/macros.h>")
- writer.writeln('#include "common/mem.h"')
+ writer.writeln('#include <common/mem.h>')
writer.newline()
writer.writeln("#ifdef _MSC_VER")
writer.writeln("#pragma warning(disable:4101)")
diff --git a/spice_codegen.py b/spice_codegen.py
index d35d949..c8376cc 100755
--- a/spice_codegen.py
+++ b/spice_codegen.py
@@ -209,8 +209,8 @@ if options.print_error:
if options.includes:
for i in options.includes:
- writer.header.writeln('#include "%s"' % i)
- writer.writeln('#include "%s"' % i)
+ writer.header.writeln('#include <%s>' % i)
+ writer.writeln('#include <%s>' % i)
if options.generate_enums or options.generate_dissector:
write_enums(writer, options.generate_dissector)