From: Jim Jagielski Date: Wed, 31 Dec 2008 17:46:47 +0000 (+0000) Subject: be consistant with naming... X-Git-Tag: 2.3.1~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31b99a73714282f9fd4cc000274327bb64a40e9e;p=thirdparty%2Fapache%2Fhttpd.git be consistant with naming... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730432 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/mem/mod_slotmem.h b/modules/mem/mod_slotmem.h index 5251fe15415..3b1ac338c1d 100644 --- a/modules/mem/mod_slotmem.h +++ b/modules/mem/mod_slotmem.h @@ -50,9 +50,9 @@ #define SLOTMEM_STORAGE "slotmem" -typedef struct ap_slotmem ap_slotmem_t; +typedef struct ap_slotmem_t ap_slotmem_t; -struct ap_slotmem { +struct ap_slotmem_t { char *name; /* per segment name */ void *shm; /* ptr to memory segment (apr_shm_t *) */ void *base; /* data set start */ @@ -61,7 +61,7 @@ struct ap_slotmem { apr_pool_t *gpool; /* per segment global pool */ apr_global_mutex_t *smutex; /* mutex */ void *context; /* general purpose storage */ - struct ap_slotmem *next; /* location of next allocated segment */ + struct ap_slotmem_t *next; /* location of next allocated segment */ }; diff --git a/modules/mem/providers/mod_plainmem.c b/modules/mem/providers/mod_plainmem.c index d9177d3e1f0..ae238043944 100644 --- a/modules/mem/providers/mod_plainmem.c +++ b/modules/mem/providers/mod_plainmem.c @@ -21,7 +21,7 @@ #include "mod_slotmem.h" /* global pool and list of slotmem we are handling */ -static struct ap_slotmem *globallistmem = NULL; +static struct ap_slotmem_t *globallistmem = NULL; static apr_pool_t *gpool = NULL; static apr_status_t slotmem_do(ap_slotmem_t *mem, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool) diff --git a/modules/mem/providers/mod_sharedmem.c b/modules/mem/providers/mod_sharedmem.c index 9a578aac13d..26015e2391d 100644 --- a/modules/mem/providers/mod_sharedmem.c +++ b/modules/mem/providers/mod_sharedmem.c @@ -27,7 +27,7 @@ struct sharedslotdesc { }; /* global pool and list of slotmem we are handling */ -static struct ap_slotmem *globallistmem = NULL; +static struct ap_slotmem_t *globallistmem = NULL; static apr_pool_t *gpool = NULL; static apr_global_mutex_t *smutex; static const char *mutex_fname;