[PATCH wayland 2/2] scanner: Emit wl_*_destroy stub even if interface has a destructor

Rob Bradford robert.bradford at intel.com
Tue Aug 13 12:06:30 PDT 2013


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

If an interface has a destructor but no 'destroy' method we used to
not emit a destroy method.  Now with the fix for missing destroy
requests for wl_pointer etc we need to emit the local wl_*_destroy
always.
---
 src/scanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scanner.c b/src/scanner.c
index 5124000..d02d865 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -606,7 +606,7 @@ emit_stubs(struct wl_list *message_list, struct interface *interface)
 		exit(EXIT_FAILURE);
 	}
 
-	if (!has_destructor && strcmp(interface->name, "wl_display") != 0)
+	if (!has_destroy && strcmp(interface->name, "wl_display") != 0)
 		printf("static inline void\n"
 		       "%s_destroy(struct %s *%s)\n"
 		       "{\n"
-- 
1.8.3.1



More information about the wayland-devel mailing list