From: Jim Jagielski Date: Tue, 18 Jun 2013 14:31:24 +0000 (+0000) Subject: make opaque X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4abca4b7e9900f867ffe3de55f64a4c1709a6e8;p=thirdparty%2Fapache%2Fhttpd.git make opaque git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494156 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/ap_skiplist.h b/include/ap_skiplist.h index b551fb2ebed..18d1bdac59b 100644 --- a/include/ap_skiplist.h +++ b/include/ap_skiplist.h @@ -27,35 +27,12 @@ typedef int (*ap_skiplist_compare) (void *, void *); typedef void (*ap_skiplist_freefunc) (void *); +struct ap_skiplist; +struct ap_skiplistnode; + typedef struct ap_skiplistnode ap_skiplistnode; typedef struct ap_skiplist ap_skiplist; -struct ap_skiplist { - ap_skiplist_compare compare; - ap_skiplist_compare comparek; - int height; - int preheight; - int size; - ap_skiplistnode *top; - ap_skiplistnode *bottom; - /* These two are needed for appending */ - ap_skiplistnode *topend; - ap_skiplistnode *bottomend; - ap_skiplist *index; - apr_pool_t *pool; -}; - -struct ap_skiplistnode { - void *data; - ap_skiplistnode *next; - ap_skiplistnode *prev; - ap_skiplistnode *down; - ap_skiplistnode *up; - ap_skiplistnode *previndex; - ap_skiplistnode *nextindex; - ap_skiplist *sl; -}; - AP_DECLARE(void *) ap_skiplist_alloc(ap_skiplist *sl, size_t size); AP_DECLARE(void) ap_skiplist_free(ap_skiplist *sl, void *mem); diff --git a/server/skiplist.c b/server/skiplist.c index f31e7b90a02..88d3df8b29a 100644 --- a/server/skiplist.c +++ b/server/skiplist.c @@ -25,6 +25,33 @@ #include "ap_skiplist.h" +struct ap_skiplist { + ap_skiplist_compare compare; + ap_skiplist_compare comparek; + int height; + int preheight; + int size; + ap_skiplistnode *top; + ap_skiplistnode *bottom; + /* These two are needed for appending */ + ap_skiplistnode *topend; + ap_skiplistnode *bottomend; + ap_skiplist *index; + apr_pool_t *pool; +}; + +struct ap_skiplistnode { + void *data; + ap_skiplistnode *next; + ap_skiplistnode *prev; + ap_skiplistnode *down; + ap_skiplistnode *up; + ap_skiplistnode *previndex; + ap_skiplistnode *nextindex; + ap_skiplist *sl; +}; + + #ifndef MIN #define MIN(a,b) ((a