From 97fef4821327b5daecbee9c6cb0fc1de93181cff Mon Sep 17 00:00:00 2001 From: Yong Bakos Date: Thu, 19 May 2016 20:31:16 -0600 Subject: [PATCH] scanner: Remove unused forward decs from client protocol 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 Reviewed-by: Reviewed-by: Bryce Harrington --- src/scanner.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scanner.c b/src/scanner.c index 037ebdb4..5f06e8e2 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -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);