From 3d51ec8a7928f313d73023cabe0d760cf1946458 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 10 Oct 2011 15:22:37 +0100 Subject: [PATCH] botor: Remove a couple of inlines to cleanup -Winline Signed-off-by: Chris Wilson --- src/cairo-botor-scan-converter.c | 2 +- src/cairo-freelist-private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cairo-botor-scan-converter.c b/src/cairo-botor-scan-converter.c index cbb752f0f..c5b1c3fa9 100644 --- a/src/cairo-botor-scan-converter.c +++ b/src/cairo-botor-scan-converter.c @@ -1072,7 +1072,7 @@ coverage_reset (struct coverage *cells) coverage_rewind (cells); } -inline static struct cell * +static struct cell * coverage_alloc (sweep_line_t *sweep_line, struct cell *tail, int x) diff --git a/src/cairo-freelist-private.h b/src/cairo-freelist-private.h index 703181b56..8fe6516f3 100644 --- a/src/cairo-freelist-private.h +++ b/src/cairo-freelist-private.h @@ -111,7 +111,7 @@ _cairo_freepool_alloc (cairo_freepool_t *freepool) cairo_freelist_node_t *node; node = freepool->first_free_node; - if (unlikely (node == NULL)) + if (node == NULL) return _cairo_freepool_alloc_from_pool (freepool); VG (VALGRIND_MAKE_MEM_DEFINED (node, sizeof (node->next)));