[cairo-commit] src/cairo-botor-scan-converter.c src/cairo-freelist-private.h

[Chris Wilson]

 src/cairo-botor-scan-converter.c |    2 +-
 src/cairo-freelist-private.h     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d51ec8a7928f313d73023cabe0d760cf1946458
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Oct 10 15:22:37 2011 +0100

    botor: Remove a couple of inlines to cleanup -Winline
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-botor-scan-converter.c b/src/cairo-botor-scan-converter.c
index cbb752f..c5b1c3f 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 703181b..8fe6516 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)));