You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@locus.apache.org on 2000/11/29 02:09:17 UTC
cvs commit: apr/include apr_hash.h apr_pools.h
gstein 00/11/28 17:09:16
Modified: include apr_hash.h apr_pools.h
Log:
The apr_hash_t typedef should stay in apr_hash.h. Use "struct apr_hash_t" in
the apr_pools.h header.
Revision Changes Path
1.16 +5 -0 apr/include/apr_hash.h
Index: apr_hash.h
===================================================================
RCS file: /home/cvs/apr/include/apr_hash.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- apr_hash.h 2000/11/29 00:21:13 1.15
+++ apr_hash.h 2000/11/29 01:09:15 1.16
@@ -82,6 +82,11 @@
#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.
*/
typedef struct apr_hash_index_t apr_hash_index_t;
1.34 +3 -4 apr/include/apr_pools.h
Index: apr_pools.h
===================================================================
RCS file: /home/cvs/apr/include/apr_pools.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- apr_pools.h 2000/11/29 00:21:13 1.33
+++ apr_pools.h 2000/11/29 01:09:15 1.34
@@ -107,7 +107,6 @@
* @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 @@
/** 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