From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 30 Jan 2007 04:20:21 +0000 (+0200)
Subject: one more iteration on PerlIO_teardown prototype
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e670910b0c400b157be823734ec6e961eafe0d4a;p=p5sagit%2Fp5-mst-13.2.git

one more iteration on PerlIO_teardown prototype
Message-Id: <20070130022021.6051443A67@anubis.hut.fi>

p4raw-id: //depot/perl@30079
---

diff --git a/perl.h b/perl.h
index 0d9ea74..fd77c0e 100644
--- a/perl.h
+++ b/perl.h
@@ -3922,7 +3922,7 @@ typedef Sighandler_t Sigsave_t;
 #endif
 
 #ifdef USE_PERLIO
-PERL_EXPORT_C void PerlIO_teardown(pTHX);
+EXTERN_C void PerlIO_teardown(pTHX);
 # ifdef USE_ITHREADS
 #  define PERLIO_INIT MUTEX_INIT(&PL_perlio_mutex)
 #  define PERLIO_TERM 				\
diff --git a/perliol.h b/perliol.h
index f062225..0c57de1 100644
--- a/perliol.h
+++ b/perliol.h
@@ -167,7 +167,10 @@ PERL_EXPORT_C PerlIO_list_t *PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE
 PERL_EXPORT_C void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
 PERL_EXPORT_C void PerlIO_list_push(pTHX_ PerlIO_list_t *list, PerlIO_funcs *funcs, SV *arg);
 PERL_EXPORT_C void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
-PERL_EXPORT_C void PerlIO_teardown(pTHX);
+
+/* PerlIO_teardown doesn't need exporting, but the EXTERN_C is needed
+ * for compiling as C++.  Must also match with what perl.h says. */
+EXTERN_C void PerlIO_teardown(pTHX);
 
 /*--------------------------------------------------------------------------------------*/
 /* Generic, or stub layer functions */