wrowe 2002/06/08 15:09:51
Modified: include apr_allocator.h apr_user.h apr_xlate.h
memory/unix apr_pools.c
Log:
Seems I was cutting a pasting just a little over the speed limit.
Thanks to Garrett for the fix.
Submitted by: Garrett Rooney <rooneg@electricjellyfish.net>
Revision Changes Path
1.9 +1 -1 apr/include/apr_allocator.h
Index: apr_allocator.h
===================================================================
RCS file: /home/cvs/apr/include/apr_allocator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_allocator.h 8 Jun 2002 20:27:42 -0000 1.8
+++ apr_allocator.h 8 Jun 2002 22:09:50 -0000 1.9
@@ -158,7 +158,7 @@
APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator);
/** @deprecated @see apr_allocator_owner_get */
-APR_DECLARE(apr_pool_t *pool) apr_allocator_get_owner(
+APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
apr_allocator_t *allocator);
/**
1.20 +0 -1 apr/include/apr_user.h
Index: apr_user.h
===================================================================
RCS file: /home/cvs/apr/include/apr_user.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apr_user.h 8 Jun 2002 20:04:26 -0000 1.19
+++ apr_user.h 8 Jun 2002 22:09:50 -0000 1.20
@@ -158,7 +158,6 @@
apr_gid_t groupid, apr_pool_t *p);
/** @deprecated @see apr_group_name_get */
-#define apr_get_groupname apr_group_name_get
APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
apr_gid_t groupid, apr_pool_t *p);
1.20 +1 -1 apr/include/apr_xlate.h
Index: apr_xlate.h
===================================================================
RCS file: /home/cvs/apr/include/apr_xlate.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apr_xlate.h 8 Jun 2002 20:30:13 -0000 1.19
+++ apr_xlate.h 8 Jun 2002 22:09:50 -0000 1.20
@@ -132,7 +132,7 @@
APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff);
/** @deprecated @see apr_xlate_sb_get */
-APR_DECLARE(void) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
+APR_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
/**
* Convert a buffer of text from one codepage to another.
1.177 +3 -3 apr/memory/unix/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- apr_pools.c 8 Jun 2002 20:27:42 -0000 1.176
+++ apr_pools.c 8 Jun 2002 22:09:50 -0000 1.177
@@ -2203,12 +2203,12 @@
APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
apr_pool_t *pool)
{
- apr_allocator_owner_set(allocator, *pool);
+ apr_allocator_owner_set(allocator, pool);
}
/* Deprecated */
-APR_DECLARE(apr_pool_t *pool) apr_allocator_get_owner(
- apr_allocator_t *allocator);
+APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
+ apr_allocator_t *allocator)
{
return apr_allocator_owner_get(allocator);
}
|