From eba804b9d4475c6d8d4728933792c5b7ca90fbf5 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 18 Jul 2011 17:26:09 +0200
Subject: PL_bincompat_options was missing options that affect the interpreter
 struct.

It had most, but not all, C pre-processor options that change the size of the
interpreter struct.
---
 perl.c |  6 ------
 perl.h | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/perl.c b/perl.c
index 914fbcd465..4878f9ca8b 100644
--- a/perl.c
+++ b/perl.c
@@ -1701,15 +1701,9 @@ S_Internals_V(pTHX_ CV *cv)
 #  ifdef USE_LOCALE
 			     " USE_LOCALE"
 #  endif
-#  ifdef USE_LOCALE_COLLATE
-			     " USE_LOCALE_COLLATE"
-#  endif
 #  ifdef USE_LOCALE_CTYPE
 			     " USE_LOCALE_CTYPE"
 #  endif
-#  ifdef USE_LOCALE_NUMERIC
-			     " USE_LOCALE_NUMERIC"
-#  endif
 #  ifdef USE_PERL_ATOF
 			     " USE_PERL_ATOF"
 #  endif	       
diff --git a/perl.h b/perl.h
index 25d29aaf6a..7304e05614 100644
--- a/perl.h
+++ b/perl.h
@@ -4629,12 +4629,24 @@ EXTCONST char PL_bincompat_options[] =
 #  ifdef FAKE_THREADS
 			     " FAKE_THREADS"
 #  endif
+#  ifdef FCRYPT
+			     " FCRYPT"
+#  endif
+#  ifdef HAS_TIMES
+			     " HAS_TIMES"
+#  endif
+#  ifdef HAVE_INTERP_INTERN
+			     "  HAVE_INTERP_INTERN"
+#  endif
 #  ifdef MULTIPLICITY
 			     " MULTIPLICITY"
 #  endif
 #  ifdef MYMALLOC
 			     " MYMALLOC"
 #  endif
+#  ifdef PERLIO_LAYERS
+			     " PERLIO_LAYERS"
+#  endif
 #  ifdef PERL_DEBUG_READONLY_OPS
 			     " PERL_DEBUG_READONLY_OPS"
 #  endif
@@ -4650,6 +4662,9 @@ EXTCONST char PL_bincompat_options[] =
 #  ifdef PERL_MAD
 			     " PERL_MAD"
 #  endif
+#  ifdef PERL_MICRO
+			     " PERL_MICRO"
+#  endif
 #  ifdef PERL_NEED_APPCTX
 			     " PERL_NEED_APPCTX"
 #  endif
@@ -4689,6 +4704,12 @@ EXTCONST char PL_bincompat_options[] =
 #  ifdef USE_LARGE_FILES
 			     " USE_LARGE_FILES"
 #  endif
+#  ifdef USE_LOCALE_COLLATE
+			     " USE_LOCALE_COLLATE"
+#  endif
+#  ifdef USE_LOCALE_NUMERIC
+			     " USE_LOCALE_NUMERIC"
+#  endif
 #  ifdef USE_LONG_DOUBLE
 			     " USE_LONG_DOUBLE"
 #  endif
-- 
cgit v1.2.1