freelist: Separate freelist inlines from the datatype in headers.

The cairo-freelist-private.h header has a number of static inline
functions which call hidden functions in libcairo.  This poses
a problem on Solaris where the native compiler compiles inline
functions whether they are used or not, thereby adding the
link time requirements on hidden functions from whatever code
that includes cairo-freelist-private.h.  Unfortunately the
boilerplate code includes cairo-private headers and indirectly
the freelist header, so linking the boilerplate helper library
fails on Solaris.

This patch separates the structure definitions from the function
prototypes and static inlines in cairo-freelist-private.h by moving
the datatypes to a new cairo-freelist-type-private.h.

1 files changed, 1 insertions, 27 deletions

diff --git a/src/cairo-freelist-private.h b/src/cairo-freelist-private.h
index 47ed23297..703181b56 100644
--- a/src/cairo-freelist-private.h
+++ b/src/cairo-freelist-private.h
@@ -24,6 +24,7 @@
 
 #include "cairo-types-private.h"
 #include "cairo-compiler-private.h"
+#include "cairo-freelist-type-private.h"
 
 /* for stand-alone compilation*/
 #ifndef VG
@@ -34,33 +35,6 @@
 #define NULL (void *) 0
 #endif
 
-typedef struct _cairo_freelist_node cairo_freelist_node_t;
-struct _cairo_freelist_node {
-    cairo_freelist_node_t *next;
-};
-
-typedef struct _cairo_freelist {
-    cairo_freelist_node_t *first_free_node;
-    unsigned nodesize;
-} cairo_freelist_t;
-
-typedef struct _cairo_freelist_pool cairo_freelist_pool_t;
-struct _cairo_freelist_pool {
-    cairo_freelist_pool_t *next;
-    unsigned size, rem;
-    uint8_t *data;
-};
-
-typedef struct _cairo_freepool {
-    cairo_freelist_node_t *first_free_node;
-    cairo_freelist_pool_t *pools;
-    cairo_freelist_pool_t *freepools;
-    unsigned nodesize;
-    cairo_freelist_pool_t embedded_pool;
-    uint8_t embedded_data[1000];
-} cairo_freepool_t;
-
-
 /* Initialise a freelist that will be responsible for allocating
  * nodes of size nodesize. */
 cairo_private void