[Wayland-bugs] [Bug 51740] [PATCH] wayland-scanner client-header generates code that needs to include wayland-client.h

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=51740

Kristian Høgsberg <krh at bitplanet.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED

--- Comment #1 from Kristian Høgsberg <krh at bitplanet.net> 2012-07-10 02:01:54 PDT ---
Thanks.  I committed your patch with a slight change:

diff --git a/src/scanner.c b/src/scanner.c
index 0076d92..50e26c1 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -868,11 +868,12 @@ emit_header(struct protocol *protocol, int server)
               "\n"
               "#include <stdint.h>\n"
               "#include <stddef.h>\n"
-              "#include \"wayland-util.h\"\n\n"
+              "#include \"%s\"\n\n"
               "struct wl_client;\n"
               "struct wl_resource;\n\n",
               protocol->uppercase_name, s,
-              protocol->uppercase_name, s);
+              protocol->uppercase_name, s,
+              server ? "wayland-util.h" : "wayland-client.h");

        wl_list_for_each(i, &protocol->interface_list, link)
                printf("struct %s;\n", i->name);

since we can't include wayland-client.h in the server side protocol header.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.