You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Justin Erenkrantz <je...@ebuilt.com> on 2001/05/19 21:28:28 UTC
[PATCH] problem with apr_sms.c commit
I think that some syntax and renaming stuff slipped through on the
recent commit to apr_sms.c. This gets it compiling again. This seems
to be what the intention was, but Dave and Sander would know for sure.
-- justin
Index: include/apr_sms.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_sms.h,v
retrieving revision 1.3
diff -u -r1.3 apr_sms.h
--- include/apr_sms.h 2001/05/19 15:35:44 1.3
+++ include/apr_sms.h 2001/05/19 19:25:53
@@ -224,7 +224,7 @@
* @param mem_sys The memory system to be released from thread-safety
* @deffunc void apr_sms_unlock(apr_sms_t *mem_sys)
*/
-APR_DECLARE(apr_status_t) apr_sms__unlock(apr_sms_t *mem_sys);
+APR_DECLARE(apr_status_t) apr_sms_unlock(apr_sms_t *mem_sys);
/**
* Determine if memory system a is an ancestor of memory system b
@@ -311,9 +311,6 @@
* @deffunc apr_status_t apr_sms_std_create(apr_sms_t **mem_sys);
*/
APR_DECLARE(apr_status_t) apr_sms_std_create(apr_sms_t **mem_sys);
-
-APR_DECLARE(apr_status_t) apr_sms_threadsafe_lock(apr_sms_t *mem_sys);
-APR_DECLARE(apr_status_t) apr_sms_threadsafe_unlock(apr_sms_t *mem_sys);
#ifdef __cplusplus
}
Index: memory/unix/apr_sms.c
===================================================================
RCS file: /home/cvspublic/apr/memory/unix/apr_sms.c,v
retrieving revision 1.4
diff -u -r1.4 apr_sms.c
--- memory/unix/apr_sms.c 2001/05/19 15:35:45 1.4
+++ memory/unix/apr_sms.c 2001/05/19 19:25:54
@@ -488,7 +488,7 @@
return !(b == a);
}
-APR_DECLARE(apr_status_t) apr_sms_threadsafe_lock(apr_sms_t *mem_sys)
+APR_DECLARE(apr_status_t) apr_sms_lock(apr_sms_t *mem_sys)
{
if (!mem_sys)
return APR_EMEMSYS;
@@ -502,7 +502,7 @@
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) apr_sms_threadsafe_unlock(apr_sms_t *mem_sys)
+APR_DECLARE(apr_status_t) apr_sms_unlock(apr_sms_t *mem_sys)
{
if (!mem_sys)
return APR_EMEMSYS;
Re: [PATCH] problem with apr_sms.c commit
Posted by Ben Laurie <be...@algroup.co.uk>.
Justin Erenkrantz wrote:
>
> I think that some syntax and renaming stuff slipped through on the
> recent commit to apr_sms.c. This gets it compiling again. This seems
> to be what the intention was, but Dave and Sander would know for sure.
Ah. I already fixed this a different way (my first commit fixed compile
time warnings but left it not linking, the second fixed the linking, but
in a different way from you).
Cheers,
Ben.
> -- justin
>
> Index: include/apr_sms.h
> ===================================================================
> RCS file: /home/cvspublic/apr/include/apr_sms.h,v
> retrieving revision 1.3
> diff -u -r1.3 apr_sms.h
> --- include/apr_sms.h 2001/05/19 15:35:44 1.3
> +++ include/apr_sms.h 2001/05/19 19:25:53
> @@ -224,7 +224,7 @@
> * @param mem_sys The memory system to be released from thread-safety
> * @deffunc void apr_sms_unlock(apr_sms_t *mem_sys)
> */
> -APR_DECLARE(apr_status_t) apr_sms__unlock(apr_sms_t *mem_sys);
> +APR_DECLARE(apr_status_t) apr_sms_unlock(apr_sms_t *mem_sys);
>
> /**
> * Determine if memory system a is an ancestor of memory system b
> @@ -311,9 +311,6 @@
> * @deffunc apr_status_t apr_sms_std_create(apr_sms_t **mem_sys);
> */
> APR_DECLARE(apr_status_t) apr_sms_std_create(apr_sms_t **mem_sys);
> -
> -APR_DECLARE(apr_status_t) apr_sms_threadsafe_lock(apr_sms_t *mem_sys);
> -APR_DECLARE(apr_status_t) apr_sms_threadsafe_unlock(apr_sms_t *mem_sys);
>
> #ifdef __cplusplus
> }
> Index: memory/unix/apr_sms.c
> ===================================================================
> RCS file: /home/cvspublic/apr/memory/unix/apr_sms.c,v
> retrieving revision 1.4
> diff -u -r1.4 apr_sms.c
> --- memory/unix/apr_sms.c 2001/05/19 15:35:45 1.4
> +++ memory/unix/apr_sms.c 2001/05/19 19:25:54
> @@ -488,7 +488,7 @@
> return !(b == a);
> }
>
> -APR_DECLARE(apr_status_t) apr_sms_threadsafe_lock(apr_sms_t *mem_sys)
> +APR_DECLARE(apr_status_t) apr_sms_lock(apr_sms_t *mem_sys)
> {
> if (!mem_sys)
> return APR_EMEMSYS;
> @@ -502,7 +502,7 @@
> return APR_SUCCESS;
> }
>
> -APR_DECLARE(apr_status_t) apr_sms_threadsafe_unlock(apr_sms_t *mem_sys)
> +APR_DECLARE(apr_status_t) apr_sms_unlock(apr_sms_t *mem_sys)
> {
> if (!mem_sys)
> return APR_EMEMSYS;
--
http://www.apache-ssl.org/ben.html
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff