diff options
| -rw-r--r-- | src/cairo-freelist-private.h | 12 | ||||
| -rw-r--r-- | src/cairo-skiplist-private.h | 14 | ||||
| -rwxr-xr-x | src/cairoint.h | 4 |
3 files changed, 17 insertions, 13 deletions
diff --git a/src/cairo-freelist-private.h b/src/cairo-freelist-private.h index 7a225ff3..41855f7e 100644 --- a/src/cairo-freelist-private.h +++ b/src/cairo-freelist-private.h @@ -21,6 +21,8 @@ */ #ifndef CAIRO_FREELIST_H #define CAIRO_FREELIST_H + +#include "cairoint.h" #include <stddef.h> /* Opaque implementation types. */ @@ -41,31 +43,31 @@ struct _cairo_freelist { /* Initialise a freelist that will be responsible for allocating * nodes of size nodesize. */ -void +cairo_private void _cairo_freelist_init (cairo_freelist_t *freelist, unsigned nodesize); /* Deallocate any nodes in the freelist. */ -void +cairo_private void _cairo_freelist_fini (cairo_freelist_t *freelist); /* Allocate a new node from the freelist. If the freelist contains no * nodes, a new one will be allocated using malloc(). The caller is * responsible for calling _cairo_freelist_free() or free() on the * returned node. Returns NULL on memory allocation error. */ -void * +cairo_private void * _cairo_freelist_alloc (cairo_freelist_t *freelist); /* Allocate a new node from the freelist. If the freelist contains no * nodes, a new one will be allocated using calloc(). The caller is * responsible for calling _cairo_freelist_free() or free() on the * returned node. Returns NULL on memory allocation error. */ -void * +cairo_private void * _cairo_freelist_calloc (cairo_freelist_t *freelist); /* Return a node to the freelist. This does not deallocate the memory, * but makes it available for later reuse by * _cairo_freelist_alloc(). */ -void +cairo_private void _cairo_freelist_free (cairo_freelist_t *freelist, void *node); #endif /* CAIRO_FREELIST_H */ diff --git a/src/cairo-skiplist-private.h b/src/cairo-skiplist-private.h index d4333986..d776ad64 100644 --- a/src/cairo-skiplist-private.h +++ b/src/cairo-skiplist-private.h @@ -24,6 +24,8 @@ #ifndef SKIPLIST_H #define SKIPLIST_H +#include "cairoint.h" + #define MAX_LEVEL 31 /* @@ -62,7 +64,7 @@ typedef struct _skip_list { * sizeof) is passed for elt_size. Note that the structure used for * list elements must have as its final member a skip_elt_t */ -void +cairo_private void skip_list_init (skip_list_t *list, skip_list_compare_t compare, size_t elt_size); @@ -71,7 +73,7 @@ skip_list_init (skip_list_t *list, /* Deallocate resources associated with a skip list and all elements * in it. (XXX: currently this simply deletes all elements.) */ -void +cairo_private void skip_list_fini (skip_list_t *list); /* Insert a new element into the list at the correct sort order as @@ -79,19 +81,19 @@ skip_list_fini (skip_list_t *list); * are ignored and the already inserted element is returned. * Otherwise data will be copied (elt_size bytes from <data> via * memcpy) and the new element is returned. */ -void * +cairo_private void * skip_list_insert (skip_list_t *list, void *data, int unique); /* Find an element which compare considers equal to <data> */ -void * +cairo_private void * skip_list_find (skip_list_t *list, void *data); /* Delete an element which compare considers equal to <data> */ -void +cairo_private void skip_list_delete (skip_list_t *list, void *data); /* Delete the given element from the list. */ -void +cairo_private void skip_list_delete_given (skip_list_t *list, skip_elt_t *given); #endif diff --git a/src/cairoint.h b/src/cairoint.h index aa17467f..1f74d623 100755 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -2236,12 +2236,12 @@ _cairo_traps_tessellate_polygon (cairo_traps_t *traps, cairo_polygon_t *poly, cairo_fill_rule_t fill_rule); -cairo_status_t +cairo_private cairo_status_t _cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom, cairo_point_t left_p1, cairo_point_t left_p2, cairo_point_t right_p1, cairo_point_t right_p2); -cairo_status_t +cairo_private cairo_status_t _cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, cairo_polygon_t *polygon, cairo_fill_rule_t fill_rule); |