This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Fix C++, MYMALLOC, sdbm combination.
authorCraig A. Berry <craigberry@mac.com>
Mon, 10 Sep 2012 02:27:44 +0000 (21:27 -0500)
committerCraig A. Berry <craigberry@mac.com>
Mon, 10 Sep 2012 02:27:44 +0000 (21:27 -0500)
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++.

ext/SDBM_File/sdbm/sdbm.h

index 2b8d0e9..2ada7a1 100644 (file)
@@ -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