5005threads builds again on windows

p4raw-id: //depot/perl@16461

diff --git a/win32/win32.c b/win32/win32.c
index 4b60d0a..78f14eb 100644 (file)
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4654,20 +4654,21 @@ Perl_init_os_extras(void)
      */
 }
 
-#ifdef MULTIPLICITY
-
-PerlInterpreter *
+void *
 win32_signal_context(void)
 {
     dTHX;
+#ifdef MULTIPLICITY
     if (!my_perl) {
        my_perl = PL_curinterp;
        PERL_SET_THX(my_perl);
     }
     return my_perl;
+#else
+    return aTHX;
+#endif
 }
 
-#endif
 
 BOOL WINAPI
 win32_ctrlhandler(DWORD dwCtrlType)
@@ -4677,6 +4678,10 @@ win32_ctrlhandler(DWORD dwCtrlType)
 
     if (!my_perl)
        return FALSE;
+#else
+#ifdef USE_5005THREADS
+    dTHX;
+#endif
 #endif
 
     switch(dwCtrlType) {

diff --git a/win32/win32.h b/win32/win32.h
index 91baa82..f37829b 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -552,7 +552,7 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[];
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
 #endif
 
-DllExport PerlInterpreter *win32_signal_context(void);
+DllExport void *win32_signal_context(void);
 #define PERL_GET_SIG_CONTEXT win32_signal_context()
 
 #endif /* _INC_WIN32_PERL5 */