You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by "William A. Rowe, Jr." <wr...@rowe-clan.net> on 2006/04/09 05:37:54 UTC
[Fwd: svn commit: r392607 - in /apr/apr/branches/1.2.x: include/apr_hash.h
tables/apr_hash.c]
I suspect this patch happens to fix Netware; IIUC netware generates it's
exports list based on AP[RU]_DECLARE[_DATA][_NONSTD] tags, but I'd really
appreciate confirmation of this before we T&R 1.2.7, which I'm all set for.
Bill
Author: wrowe
Date: Sat Apr 8 14:08:01 2006
New Revision: 392607
URL: http://svn.apache.org/viewcvs?rev=392607&view=rev
Log:
jorton claims this is an exported function, although that's not necessary
to set the initial hash function. _NONSTD is required to stick with the
STDC calling convention for binary compatibility within apr and for
external apps.
Backport: 392605
Modified:
apr/apr/branches/1.2.x/include/apr_hash.h
apr/apr/branches/1.2.x/tables/apr_hash.c
Modified: apr/apr/branches/1.2.x/include/apr_hash.h
URL:
http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/include/apr_hash.h?rev=392607&r1=392606&r2=392607&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/include/apr_hash.h (original)
+++ apr/apr/branches/1.2.x/include/apr_hash.h Sat Apr 8 14:08:01 2006
@@ -67,7 +67,8 @@
/**
* The default hash function.
*/
-unsigned int apr_hashfunc_default(const char *key, apr_ssize_t *klen);
+APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *key,
+ apr_ssize_t *klen);
/**
* Create a hash table.
Modified: apr/apr/branches/1.2.x/tables/apr_hash.c
URL:
http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/tables/apr_hash.c?rev=392607&r1=392606&r2=392607&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/tables/apr_hash.c (original)
+++ apr/apr/branches/1.2.x/tables/apr_hash.c Sat Apr 8 14:08:01 2006
@@ -178,7 +178,8 @@
ht->max = new_max;
}
-unsigned int apr_hashfunc_default(const char *char_key, apr_ssize_t *klen)
+APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *char_key,
+ apr_ssize_t *klen)
{
unsigned int hash = 0;
const unsigned char *key = (const unsigned char *)char_key;
Re: [Fwd: svn commit: r392607 - in /apr/apr/branches/1.2.x:
include/apr_hash.h tables/apr_hash.c]
Posted by Brad Nicholes <BN...@novell.com>.
It actually has little effect on NetWare because the symbol is never used outside of apr-util. The only place that I could find a reference to the symbol is as a callback function assignment. However if the intention of this function is to be referenced or called from outside of apr-util somehow, then it would be a problem. But you are correct, NetWare's export list is based on AP[RU]_DECLARE[_DATA][_NONSTD] tags.
Brad
>>> On 4/8/2006 at 9:37:54 pm, in message <44...@rowe-clan.net>,
"William A. Rowe, Jr." <wr...@rowe-clan.net> wrote:
> I suspect this patch happens to fix Netware; IIUC netware generates it's
> exports list based on AP[RU]_DECLARE[_DATA][_NONSTD] tags, but I'd really
> appreciate confirmation of this before we T&R 1.2.7, which I'm all set for.
>
> Bill
>
> Author: wrowe
> Date: Sat Apr 8 14:08:01 2006
> New Revision: 392607
>
> URL: http://svn.apache.org/viewcvs?rev=392607&view=rev
> Log:
>
> jorton claims this is an exported function, although that's not necessary
> to set the initial hash function. _NONSTD is required to stick with the
> STDC calling convention for binary compatibility within apr and for
> external apps.
>
> Backport: 392605
>
> Modified:
> apr/apr/branches/1.2.x/include/apr_hash.h
> apr/apr/branches/1.2.x/tables/apr_hash.c
>
> Modified: apr/apr/branches/1.2.x/include/apr_hash.h
> URL:
> http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/include/apr_hash.h?rev=
> 392607&r1=392606&r2=392607&view=diff
> ============================================================================
> ==
> --- apr/apr/branches/1.2.x/include/apr_hash.h (original)
> +++ apr/apr/branches/1.2.x/include/apr_hash.h Sat Apr 8 14:08:01 2006
> @@ -67,7 +67,8 @@
> /**
> * The default hash function.
> */
> -unsigned int apr_hashfunc_default(const char *key, apr_ssize_t *klen);
> +APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *key,
> + apr_ssize_t *klen);
>
> /**
> * Create a hash table.
>
> Modified: apr/apr/branches/1.2.x/tables/apr_hash.c
> URL:
> http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/tables/apr_hash.c?rev=3
> 92607&r1=392606&r2=392607&view=diff
> ============================================================================
> ==
> --- apr/apr/branches/1.2.x/tables/apr_hash.c (original)
> +++ apr/apr/branches/1.2.x/tables/apr_hash.c Sat Apr 8 14:08:01 2006
> @@ -178,7 +178,8 @@
> ht->max = new_max;
> }
>
> -unsigned int apr_hashfunc_default(const char *char_key, apr_ssize_t *klen)
> +APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *char_key,
> + apr_ssize_t *klen)
> {
> unsigned int hash = 0;
> const unsigned char *key = (const unsigned char *)char_key