diff options
author | ume <ume@FreeBSD.org> | 2012-11-28 11:47:47 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2012-11-28 11:47:47 +0000 |
commit | 89a7b590a468a5f41bb8e98563b5ba5b55f00e3b (patch) | |
tree | 81b7338d4dc28f3946403f3d19840f8d1d0e80c2 /contrib/sendmail | |
parent | 9817eedd68000f200c41e5974d6d016a3aa9e72d (diff) | |
download | FreeBSD-src-89a7b590a468a5f41bb8e98563b5ba5b55f00e3b.zip FreeBSD-src-89a7b590a468a5f41bb8e98563b5ba5b55f00e3b.tar.gz |
cyrus-sasl 2.1.26 was released. In this version, the type of callback
functions was changed from "unsigned long" to "size_t".
Reviewed by: gshapiro
MFC after: 3 days
Diffstat (limited to 'contrib/sendmail')
-rw-r--r-- | contrib/sendmail/src/sasl.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/contrib/sendmail/src/sasl.c b/contrib/sendmail/src/sasl.c index 6f9e4a5..c3f561d 100644 --- a/contrib/sendmail/src/sasl.c +++ b/contrib/sendmail/src/sasl.c @@ -24,9 +24,15 @@ SM_RCSID("@(#)$Id: sasl.c,v 8.22 2006/08/15 23:24:57 ca Exp $") ** using unsigned long: for portability, it should be size_t. */ -void *sm_sasl_malloc __P((unsigned long)); -static void *sm_sasl_calloc __P((unsigned long, unsigned long)); -static void *sm_sasl_realloc __P((void *, unsigned long)); +#if defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a +#define SM_SASL_SIZE_T size_t +#else /* defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a */ +#define SM_SASL_SIZE_T unsigned long +#endif /* defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a */ + +void *sm_sasl_malloc __P((SM_SASL_SIZE_T)); +static void *sm_sasl_calloc __P((SM_SASL_SIZE_T, SM_SASL_SIZE_T)); +static void *sm_sasl_realloc __P((void *, SM_SASL_SIZE_T)); void sm_sasl_free __P((void *)); /* @@ -50,7 +56,7 @@ void sm_sasl_free __P((void *)); void * sm_sasl_malloc(size) - unsigned long size; + SM_SASL_SIZE_T size; { return sm_malloc((size_t) size); } @@ -71,8 +77,8 @@ sm_sasl_malloc(size) static void * sm_sasl_calloc(nelem, elemsize) - unsigned long nelem; - unsigned long elemsize; + SM_SASL_SIZE_T nelem; + SM_SASL_SIZE_T elemsize; { size_t size; void *p; @@ -99,7 +105,7 @@ sm_sasl_calloc(nelem, elemsize) static void * sm_sasl_realloc(o, size) void *o; - unsigned long size; + SM_SASL_SIZE_T size; { return sm_realloc(o, (size_t) size); } |