summaryrefslogtreecommitdiff
path: root/boilerplate
diff options
context:
space:
mode:
authorGeorge Matsumura <gmmatsumura01@bvsd.org>2020-08-31 22:14:59 -0600
committerGeorge Matsumura <gmmatsumura01@bvsd.org>2020-11-07 06:45:01 -0700
commited98414686ede45a4f2302b4521dece51acdb785 (patch)
tree578ed64ae1ab3538a3cb5130587075e81f9acc49 /boilerplate
parent618b13c436636149bb1c611a9f4a422f60c6476d (diff)
downloadcairo-ed98414686ede45a4f2302b4521dece51acdb785.tar.gz
build: Fix various compiler warnings
This fixes a few compiler warnings that were encountered with gcc 9.3.0. Signed-off-by: George Matsumura <gmmatsumura01@bvsd.org>
Diffstat (limited to 'boilerplate')
-rw-r--r--boilerplate/cairo-boilerplate-cogl.c5
-rw-r--r--boilerplate/cairo-boilerplate-egl.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/boilerplate/cairo-boilerplate-cogl.c b/boilerplate/cairo-boilerplate-cogl.c
index 2339dd883..0982e4133 100644
--- a/boilerplate/cairo-boilerplate-cogl.c
+++ b/boilerplate/cairo-boilerplate-cogl.c
@@ -31,7 +31,6 @@
*/
#include "cairo-boilerplate-private.h"
-#include "cairo-malloc-private.h"
#include <cairo-cogl.h>
#include <cogl/cogl2-experimental.h>
@@ -81,7 +80,7 @@ _cairo_boilerplate_cogl_create_offscreen_color_surface (const char *name,
/* The device will take a reference on the context */
cogl_object_unref (context);
- closure = _cairo_malloc (sizeof (cogl_closure_t));
+ closure = malloc (sizeof (cogl_closure_t));
*abstract_closure = closure;
closure->device = device;
closure->surface = cairo_cogl_offscreen_surface_create (device,
@@ -152,7 +151,7 @@ _cairo_boilerplate_cogl_create_onscreen_color_surface (const char *name,
/* The device will take a reference on the context */
cogl_object_unref (context);
- closure = _cairo_malloc (sizeof (cogl_closure_t));
+ closure = malloc (sizeof (cogl_closure_t));
*abstract_closure = closure;
closure->device = device;
closure->surface = cairo_cogl_onscreen_surface_create (device,
diff --git a/boilerplate/cairo-boilerplate-egl.c b/boilerplate/cairo-boilerplate-egl.c
index c44441cc5..8196b1ffd 100644
--- a/boilerplate/cairo-boilerplate-egl.c
+++ b/boilerplate/cairo-boilerplate-egl.c
@@ -42,8 +42,6 @@
#include <GL/gl.h>
#endif
-static const cairo_user_data_key_t gl_closure_key;
-
typedef struct _egl_target_closure {
EGLDisplay dpy;
EGLContext ctx;