[PATCH] Include wayland-client.h in exported client protocol headers

Michael Hasselmann michaelh at openismus.com
Sun Jun 19 10:39:39 PDT 2011


---
 wayland/scanner.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wayland/scanner.c b/wayland/scanner.c
index b6aebdb..6499977 100644
--- a/wayland/scanner.c
+++ b/wayland/scanner.c
@@ -560,11 +560,13 @@ emit_header(struct protocol *protocol, int server)
 	       "\n"
 	       "#include <stdint.h>\n"
 	       "#include <stddef.h>\n"
-	       "#include \"wayland-util.h\"\n\n"
+	       "#include \"wayland-util.h\"\n"
+	       "%s\n"
 	       "struct wl_client;\n\n",
 	       copyright,
 	       protocol->uppercase_name, s,
-	       protocol->uppercase_name, s);
+	       protocol->uppercase_name, s,
+	       server ? "" : "#include \"wayland-client.h\"\n");
 
 	wl_list_for_each(i, &protocol->interface_list, link)
 		printf("struct %s;\n", i->name);
-- 
1.7.5.4


--=-AiLtmmU2Gl170pkrPslK--



More information about the wayland-devel mailing list