compile errors after recent function renaming

[Garrett Rooney <ro...@electricjellyfish.net>]

after the recent renaming of functions, i ran into a bunch of compile
errors.  here are the changes i had to make to get things building
again.

-garrett

Index: include/apr_allocator.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_allocator.h,v
retrieving revision 1.8
diff -u -r1.8 apr_allocator.h
--- include/apr_allocator.h	8 Jun 2002 20:27:42 -0000	1.8
+++ include/apr_allocator.h	8 Jun 2002 21:02:50 -0000
@@ -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);
 
 /**
Index: include/apr_user.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_user.h,v
retrieving revision 1.19
diff -u -r1.19 apr_user.h
--- include/apr_user.h	8 Jun 2002 20:04:26 -0000	1.19
+++ include/apr_user.h	8 Jun 2002 21:02:50 -0000
@@ -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);
 
Index: include/apr_xlate.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_xlate.h,v
retrieving revision 1.19
diff -u -r1.19 apr_xlate.h
--- include/apr_xlate.h	8 Jun 2002 20:30:13 -0000	1.19
+++ include/apr_xlate.h	8 Jun 2002 21:02:50 -0000
@@ -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.
Index: memory/unix/apr_pools.c
===================================================================
RCS file: /home/cvspublic/apr/memory/unix/apr_pools.c,v
retrieving revision 1.176
diff -u -r1.176 apr_pools.c
--- memory/unix/apr_pools.c	8 Jun 2002 20:27:42 -0000	1.176
+++ memory/unix/apr_pools.c	8 Jun 2002 21:02:51 -0000
@@ -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);
 }

-- 
garrett rooney                    Remember, any design flaw you're 
rooneg@electricjellyfish.net      sufficiently snide about becomes  
http://electricjellyfish.net/     a feature.       -- Dan Sugalski

Re: compile errors after recent function renaming

["William A. Rowe, Jr." <wr...@rowe-clan.net>]

At 04:11 PM 6/8/2002, Garrett wrote:
>after the recent renaming of functions, i ran into a bunch of compile
>errors.  here are the changes i had to make to get things building
>again.


Commited, thanks!