[PATCH wayland 0/6] Add flags argument to wl_closure_invoke calls in tests

Jason Ekstrand jason at jlekstrand.net
Fri Mar 15 17:33:39 PDT 2013


---
This patch should actually go at the begining of the series before 1/6.  I
accidentally forgot to include it and didn't notice until someone tried to
apply the series.

 tests/connection-test.c  | 6 +++---
 tests/os-wrappers-test.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/connection-test.c b/tests/connection-test.c
index 1ac88d2..d5b3a99 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -338,7 +338,7 @@ demarshal(struct marshal_data *data, const char *format,
 	closure = wl_connection_demarshal(data->read_connection,
 					  size, &objects, &message);
 	assert(closure);
-	wl_closure_invoke(closure, &object, func, data);
+	wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data);
 	wl_closure_destroy(closure);
 }
 
@@ -418,7 +418,7 @@ marshal_demarshal(struct marshal_data *data,
 	object.id = msg[0];
 	closure = wl_connection_demarshal(data->read_connection,
 					  size, &objects, &message);
-	wl_closure_invoke(closure, &object, func, data);
+	wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data);
 	wl_closure_destroy(closure);
 }
 
@@ -505,7 +505,7 @@ marshal_helper(const char *format, void *handler, ...)
 
 	assert(closure);
 	done = 0;
-	wl_closure_invoke(closure, &object, handler, &done);
+	wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, handler, &done);
 	wl_closure_destroy(closure);
 	assert(done);
 }
diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c
index 515fd81..ce6fda6 100644
--- a/tests/os-wrappers-test.c
+++ b/tests/os-wrappers-test.c
@@ -252,7 +252,7 @@ marshal_demarshal(struct marshal_data *data,
 	object.id = msg[0];
 	closure = wl_connection_demarshal(data->read_connection,
 					  size, &objects, &message);
-	wl_closure_invoke(closure, &object, func, data);
+	wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data);
 	wl_closure_destroy(closure);
 }
 
-- 
1.8.1.4



More information about the wayland-devel mailing list