Integrate mainline

p4raw-id: //depot/perlio@14926

1 files changed, 6 insertions, 0 deletions

diff --git a/perl.h b/perl.h
index 856e0be63a..4f94734f7a 100644
--- a/perl.h
+++ b/perl.h
@@ -42,6 +42,10 @@
 /* See L<perlguts/"The Perl API"> for detailed notes on
  * PERL_IMPLICIT_CONTEXT and PERL_IMPLICIT_SYS */
 
+/* Note that from here --> to <-- the same logic is
+ * repeated in makedef.pl, so be certain to update
+ * both places when editing. */
+
 #ifdef PERL_IMPLICIT_SYS
 /* PERL_IMPLICIT_SYS implies PerlMemShared != PerlMem
    so use slab allocator to avoid lots of MUTEX overhead
@@ -69,6 +73,8 @@
 #  endif
 #endif
 
+/* <--- here ends the logic shared by perl.h and makedef.pl */
+
 #ifdef PERL_IMPLICIT_CONTEXT
 #  ifdef USE_5005THREADS
 struct perl_thread;