From 7d6f157352aa0f9e160447b67eb55a49d2a490c5 Mon Sep 17 00:00:00 2001 From: gstein Date: Wed, 29 Nov 2000 01:09:15 +0000 Subject: The apr_hash_t typedef should stay in apr_hash.h. Use "struct apr_hash_t" in the apr_pools.h header. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60809 13f79535-47bb-0310-9956-ffa450edef68 --- include/apr_hash.h | 5 +++++ include/apr_pools.h | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/apr_hash.h b/include/apr_hash.h index 39d8e075e..dde1f10c9 100644 --- a/include/apr_hash.h +++ b/include/apr_hash.h @@ -81,6 +81,11 @@ extern "C" { */ #define APR_HASH_KEY_STRING (-1) +/* + * Abstract type for hash tables. + */ +typedef struct apr_hash_t apr_hash_t; + /* * Abstract type for scanning hash tables. */ diff --git a/include/apr_pools.h b/include/apr_pools.h index 76c1b4bab..98705202f 100644 --- a/include/apr_pools.h +++ b/include/apr_pools.h @@ -107,7 +107,6 @@ extern "C" { * @package APR memory allocation */ typedef struct apr_pool_t apr_pool_t; -typedef struct apr_hash_t apr_hash_t; /** The memory allocation structure */ @@ -142,9 +141,9 @@ struct apr_pool_t { /** A function to control how pools behave when they receive ENOMEM * @deffunc int apr_abort(int retcode) */ int (*apr_abort)(int retcode); - /** A place to hand user data associated with this pool - * @defvar datastruct *prog_data */ - apr_hash_t *prog_data; + /** A place to hold user data associated with this pool + * @defvar apr_hash_t *prog_data */ + struct apr_hash_t *prog_data; }; /* pools have nested lifetimes -- sub_pools are destroyed when the -- cgit v1.2.1