1.1 --- a/librazor/razor-internal.h	Wed Apr 22 16:27:11 2009 +0100
     1.2 +++ b/librazor/razor-internal.h	Thu May 14 05:50:37 2009 +0100
     1.3 @@ -26,6 +26,7 @@
     1.4  #include <unistd.h>
     1.5  
     1.6  #include "razor.h"
     1.7 +#include "types/types.h"
     1.8  
     1.9  /* GCC visibility */
    1.10  #if defined(__GNUC__) && __GNUC__ >= 4
    1.11 @@ -39,49 +40,6 @@
    1.12  
    1.13  void *zalloc(size_t size);
    1.14  
    1.15 -struct array {
    1.16 -	void *data;
    1.17 -	int size, alloc;
    1.18 -};
    1.19 -
    1.20 -void array_init(struct array *array);
    1.21 -void array_release(struct array *array);
    1.22 -void *array_add(struct array *array, int size);
    1.23 -
    1.24 -
    1.25 -struct list_head {
    1.26 -	uint32_t list_ptr : 24;
    1.27 -	uint32_t flags    : 8;
    1.28 -};
    1.29 -
    1.30 -struct list {
    1.31 -	uint32_t data  : 24;
    1.32 -	uint32_t flags : 8;
    1.33 -};
    1.34 -
    1.35 -void list_set_empty(struct list_head *head);
    1.36 -void list_set_ptr(struct list_head *head, uint32_t ptr);
    1.37 -void list_set_array(struct list_head *head, struct array *pool, struct array *items, int force_indirect);
    1.38 -
    1.39 -struct list *list_first(struct list_head *head, struct array *pool);
    1.40 -struct list *list_next(struct list *list);
    1.41 -
    1.42 -void list_remap_pool(struct array *pool, uint32_t *map);
    1.43 -void list_remap_head(struct list_head *list, uint32_t *map);
    1.44 -
    1.45 -
    1.46 -struct hashtable {
    1.47 -	struct array buckets;
    1.48 -	struct array *pool;
    1.49 -};
    1.50 -
    1.51 -void hashtable_init(struct hashtable *table, struct array *pool);
    1.52 -void hashtable_release(struct hashtable *table);
    1.53 -uint32_t hashtable_insert(struct hashtable *table, const char *key);
    1.54 -uint32_t hashtable_lookup(struct hashtable *table, const char *key);
    1.55 -uint32_t hashtable_tokenize(struct hashtable *table, const char *string);
    1.56 -
    1.57 -
    1.58  struct razor_set_section {
    1.59  	uint32_t name;
    1.60  	uint32_t offset;