diff options
author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2019-02-02 09:52:20 +0100 |
---|---|---|
committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2019-02-02 09:52:20 +0100 |
commit | 5ca40dd074030726ffb9428aa6d66f61d3dd5a94 (patch) | |
tree | b57ddde976daf5a29e01767a491ded688ad7d922 | |
parent | 7c0862cf4f78d7cad5e24e048d86ad52a1a0438d (diff) | |
parent | aec176a86cc327a64dcfdcd60a35f4369960f0db (diff) | |
download | nuk.lv2-5ca40dd074030726ffb9428aa6d66f61d3dd5a94.tar.xz |
Merge commit 'aec176a86cc327a64dcfdcd60a35f4369960f0db'
-rw-r--r-- | pugl/pugl/cairo_gl.h | 3 | ||||
-rw-r--r-- | pugl/pugl/pugl_internal.h | 2 | ||||
-rw-r--r-- | pugl/pugl/pugl_x11.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pugl/pugl/cairo_gl.h b/pugl/pugl/cairo_gl.h index 5c0f1f9..fb4cb2a 100644 --- a/pugl/pugl/cairo_gl.h +++ b/pugl/pugl/cairo_gl.h @@ -48,7 +48,8 @@ pugl_cairo_gl_free(PuglCairoGL* ctx) } static void -pugl_cairo_gl_configure(PuglCairoGL* ctx, int width, int height) +pugl_cairo_gl_configure(PuglCairoGL* ctx, + int width __attribute__((unused)), int height __attribute__((unused))) { glDisable(GL_DEPTH_TEST); glEnable(GL_BLEND); diff --git a/pugl/pugl/pugl_internal.h b/pugl/pugl/pugl_internal.h index 45084de..5976cd7 100644 --- a/pugl/pugl/pugl_internal.h +++ b/pugl/pugl/pugl_internal.h @@ -64,7 +64,7 @@ struct PuglViewImpl { PuglInternals* puglInitInternals(void); PuglView* -puglInit(int* pargc, char** argv) +puglInit(int* pargc __attribute__((unused)), char** argv __attribute__((unused))) { PuglView* view = (PuglView*)calloc(1, sizeof(PuglView)); if (!view) { diff --git a/pugl/pugl/pugl_x11.c b/pugl/pugl/pugl_x11.c index 28fe99f..5c20782 100644 --- a/pugl/pugl/pugl_x11.c +++ b/pugl/pugl/pugl_x11.c @@ -476,6 +476,7 @@ translateEvent(PuglView* view, XEvent xevent) if (!strcmp(type, "WM_PROTOCOLS")) { event.type = PUGL_CLOSE; } + XFree(type); break; } case ConfigureNotify: @@ -521,6 +522,7 @@ translateEvent(PuglView* view, XEvent xevent) case 7: event.scroll.dx = 1.0f; break; } } + __attribute__((fallthrough)); // nobreak case ButtonRelease: if (xevent.xbutton.button < 4 || xevent.xbutton.button > 7) { @@ -798,7 +800,7 @@ puglGetNativeWindow(PuglView* view) } void* -puglGetContext(PuglView* view) +puglGetContext(PuglView* view __attribute__((unused))) { #ifdef PUGL_HAVE_CAIRO if (view->ctx_type & PUGL_CAIRO) { |