In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/86f11a3d4085bbaf2b72fce18f55bd5a0cfc46d3?hp=7cd83f6573da7fd1101fc83cb13867d52fea3d41>
- Log ----------------------------------------------------------------- commit 86f11a3d4085bbaf2b72fce18f55bd5a0cfc46d3 Author: Craig A. Berry <[email protected]> Date: Sun Sep 9 21:27:44 2012 -0500 Fix C++, MYMALLOC, sdbm combination. The prototypes for the home-grown malloc replacements were not protected with extern "C" declarations, so linking the SDBM_File extension failed when configuring with -Dusemymalloc=y and building with C++. ----------------------------------------------------------------------- Summary of changes: ext/SDBM_File/sdbm/sdbm.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm/sdbm.h index 2b8d0e9..2ada7a1 100644 --- a/ext/SDBM_File/sdbm/sdbm.h +++ b/ext/SDBM_File/sdbm/sdbm.h @@ -179,10 +179,19 @@ extern long sdbm_hash proto((const char *, int)); # define realloc Perl_realloc # define free Perl_mfree +#ifdef __cplusplus +extern "C" { +#endif + Malloc_t Perl_malloc proto((MEM_SIZE nbytes)); Malloc_t Perl_calloc proto((MEM_SIZE elements, MEM_SIZE size)); Malloc_t Perl_realloc proto((Malloc_t where, MEM_SIZE nbytes)); Free_t Perl_mfree proto((Malloc_t where)); + +#ifdef __cplusplus +} +#endif + #endif /* MYMALLOC */ #ifdef I_STRING -- Perl5 Master Repository
