scanner: Remove unused forward decs from client protocol
authorYong Bakos <ybakos@humanoriented.com>
Fri, 20 May 2016 02:31:16 +0000 (20:31 -0600)
committerBryce Harrington <bryce@osg.samsung.com>
Fri, 20 May 2016 21:58:59 +0000 (14:58 -0700)
wayland-client-protocol.h had forward declarations for wl_client and
wl_resource, yet nothing on the client side references these types.

Add a 'side' condition to only generate these forward declarations in the
server protocol header.

Signed-off-by: Yong Bakos <ybakos@humanoriented.com>
Reviewed-by: <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
src/scanner.c

index 037ebdb..5f06e8e 100644 (file)
@@ -1477,13 +1477,13 @@ emit_header(struct protocol *protocol, enum side side)
               "#include \"%s\"\n\n"
               "#ifdef  __cplusplus\n"
               "extern \"C\" {\n"
-              "#endif\n"
-              "\n"
-              "struct wl_client;\n"
-              "struct wl_resource;\n\n",
+              "#endif\n\n",
               protocol->uppercase_name, s,
               protocol->uppercase_name, s,
               get_include_name(protocol->core_headers, side));
+       if (side == SERVER)
+               printf("struct wl_client;\n"
+                      "struct wl_resource;\n\n");
 
        emit_mainpage_blurb(protocol, side);