Merge branch 'master' into screencontent

6 files changed, 4 insertions, 7 deletions

diff --git a/examples/layer-shell.c b/examples/layer-shell.c
index ec25fe42..21ef3e93 100644
--- a/examples/layer-shell.c
+++ b/examples/layer-shell.c
@@ -149,7 +149,7 @@ static void draw(void) {
 	demo.last_frame = ts;
 }
 
-static void draw_popup() {
+static void draw_popup(void) {
 	static float alpha_mod = -0.01;
 
 	eglMakeCurrent(egl.display, popup_egl_surface, popup_egl_surface, egl.context);
@@ -188,7 +188,7 @@ static void xdg_popup_configure(void *data, struct xdg_popup *xdg_popup,
 	}
 }
 
-static void popup_destroy() {
+static void popup_destroy(void) {
 	wlr_egl_destroy_surface(&egl, popup_egl_surface);
 	wl_egl_window_destroy(popup_egl_window);
 	xdg_popup_destroy(popup);
diff --git a/examples/output-layout.c b/examples/output-layout.c
index 7b847a3b..bdc8d352 100644
--- a/examples/output-layout.c
+++ b/examples/output-layout.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[]) {
 	wl_display_run(display);
 
 	wlr_texture_destroy(state.cat_texture);
-	wlr_renderer_destroy(state.renderer);
 
 	wlr_output_layout_destroy(state.layout);
+	wl_display_destroy(state.display);
 }
diff --git a/examples/rotation.c b/examples/rotation.c
index bd39a21e..9e9e059a 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -268,6 +268,5 @@ int main(int argc, char *argv[]) {
 	wl_display_run(display);
 
 	wlr_texture_destroy(state.cat_texture);
-	wlr_renderer_destroy(state.renderer);
 	wl_display_destroy(display);
 }
diff --git a/examples/simple.c b/examples/simple.c
index 60acd7db..cbe60c98 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -143,7 +143,7 @@ void new_input_notify(struct wl_listener *listener, void *data) {
 	}
 }
 
-int main() {
+int main(void) {
 	wlr_log_init(L_DEBUG, NULL);
 	struct wl_display *display = wl_display_create();
 	struct sample_state state = {
diff --git a/examples/tablet.c b/examples/tablet.c
index f5c4bbb5..e734ca84 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -372,6 +372,5 @@ int main(int argc, char *argv[]) {
 	}
 	wl_display_run(display);
 
-	wlr_renderer_destroy(state.renderer);
 	wl_display_destroy(display);
 }
diff --git a/examples/touch.c b/examples/touch.c
index 68f78a0a..0e77b48e 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -277,6 +277,5 @@ int main(int argc, char *argv[]) {
 	wl_display_run(display);
 
 	wlr_texture_destroy(state.cat_texture);
-	wlr_renderer_destroy(state.renderer);
 	wl_display_destroy(display);
 }