From: Mariusz Ceier <mceier+wayland@gmail.com>
Date: Mon, 15 Dec 2014 11:48:38 +0000 (+0100)
Subject: scanner: Fix header generation for server protocols
X-Git-Tag: 1.6.92~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6197f32cadc82d62a3641385098fe5ffebc147d6;p=platform%2Fupstream%2Fwayland.git

scanner: Fix header generation for server protocols

Server protocols headers should include wayland-server.h,
instead of wayland-util.h. Otherwise they're not useable
with C++ compiler unless wayland-server.h was included
earlier.

Signed-off-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
---

diff --git a/src/scanner.c b/src/scanner.c
index ca03c57..1f1e59a 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1002,7 +1002,7 @@ emit_header(struct protocol *protocol, enum side side)
 	       "struct wl_resource;\n\n",
 	       protocol->uppercase_name, s,
 	       protocol->uppercase_name, s,
-	       (side == SERVER) ? "wayland-util.h" : "wayland-client.h");
+	       (side == SERVER) ? "wayland-server.h" : "wayland-client.h");
 
 	wl_list_for_each(i, &protocol->interface_list, link)
 		printf("struct %s;\n", i->name);