Fix more Win32 linker errors caused by change 24561

Apparently sys_intern_init and sys_intern_clear are required even for
non-threaded builds on Win32.

p4raw-id: //depot/perl@24605

diff --git a/embed.fnc b/embed.fnc
index 2c03d96..625e5e1 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -953,9 +953,11 @@ Ap |void   |ptr_table_clear|PTR_TBL_t *tbl
 Ap     |void   |ptr_table_free|PTR_TBL_t *tbl
 #  if defined(HAVE_INTERP_INTERN)
 Ap     |void   |sys_intern_dup |NN struct interp_intern* src|NN struct interp_intern* dst
+#  endif
+#endif
+#if defined(HAVE_INTERP_INTERN)
 Ap     |void   |sys_intern_clear
 Ap     |void   |sys_intern_init
-#  endif
 #endif
 
 Ap     |char * |custom_op_name |NN const OP* op

diff --git a/embed.h b/embed.h
index 648f821..43f18b3 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -992,9 +992,11 @@
 #define ptr_table_free         Perl_ptr_table_free
 #  if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup         Perl_sys_intern_dup
+#  endif
+#endif
+#if defined(HAVE_INTERP_INTERN)
 #define sys_intern_clear       Perl_sys_intern_clear
 #define sys_intern_init                Perl_sys_intern_init
-#  endif
 #endif
 #define custom_op_name         Perl_custom_op_name
 #define custom_op_desc         Perl_custom_op_desc
@@ -2971,9 +2973,11 @@
 #define ptr_table_free(a)      Perl_ptr_table_free(aTHX_ a)
 #  if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup(a,b)    Perl_sys_intern_dup(aTHX_ a,b)
+#  endif
+#endif
+#if defined(HAVE_INTERP_INTERN)
 #define sys_intern_clear()     Perl_sys_intern_clear(aTHX)
 #define sys_intern_init()      Perl_sys_intern_init(aTHX)
-#  endif
 #endif
 #define custom_op_name(a)      Perl_custom_op_name(aTHX_ a)
 #define custom_op_desc(a)      Perl_custom_op_desc(aTHX_ a)

diff --git a/proto.h b/proto.h
index 89e3071..1a656e8 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1758,9 +1758,11 @@ PERL_CALLCONV void       Perl_sys_intern_dup(pTHX_ struct interp_intern* src, struct i
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
+#  endif
+#endif
+#if defined(HAVE_INTERP_INTERN)
 PERL_CALLCONV void     Perl_sys_intern_clear(pTHX);
 PERL_CALLCONV void     Perl_sys_intern_init(pTHX);
-#  endif
 #endif
 
 PERL_CALLCONV char *   Perl_custom_op_name(pTHX_ const OP* op)