diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2012-12-29 20:30:46 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2012-12-29 20:30:46 +0000 |
| commit | 840d2bbbfce5c06cdb4e10ce26107aa98d13e700 (patch) | |
| tree | 1e7560ff85bedb732a3f654dd9ad287affaac140 /contrib/sendmail/src/sasl.c | |
| parent | 896fc63862ccf01e4da5831d63296c6c274972a0 (diff) | |
| download | FreeBSD-src-840d2bbbfce5c06cdb4e10ce26107aa98d13e700.zip FreeBSD-src-840d2bbbfce5c06cdb4e10ce26107aa98d13e700.tar.gz | |
Merge sendmail 8.14.6 to HEAD
MFC after: 4 days
Diffstat (limited to 'contrib/sendmail/src/sasl.c')
| -rw-r--r-- | contrib/sendmail/src/sasl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/sendmail/src/sasl.c b/contrib/sendmail/src/sasl.c index c3f561d..0e4e8e1 100644 --- a/contrib/sendmail/src/sasl.c +++ b/contrib/sendmail/src/sasl.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: sasl.c,v 8.22 2006/08/15 23:24:57 ca Exp $") +SM_RCSID("@(#)$Id: sasl.c,v 8.23 2012/11/27 18:53:13 gshapiro Exp $") #if SASL # include <stdlib.h> @@ -20,15 +20,15 @@ SM_RCSID("@(#)$Id: sasl.c,v 8.22 2006/08/15 23:24:57 ca Exp $") ** In order to ensure that storage leaks are tracked, and to prevent ** conflicts between the sm_heap package and sasl, we tell sasl to ** use the following heap allocation functions. Unfortunately, -** the sasl package incorrectly specifies the size of a block +** older sasl packages incorrectly specifies the size of a block ** using unsigned long: for portability, it should be size_t. */ -#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 */ +# 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)); |
