[win32] reverse integrate mainline

p4raw-id: //depot/win32/perl@302

diff --cc op.c
Simple merge

diff --cc perl.h
index 724384f,0ffb04c..c05d4a9
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
@@@ -2301,6 -2309,6 +2309,10 @@@ EXT bool       numeric_local INIT(TRUE);    /
  #define PERL_SCRIPT_MODE "r"
  #endif
  
++#ifndef PERL_SCRIPT_MODE
++#define PERL_SCRIPT_MODE "r"
++#endif
++
  /*
   * nice_chunk and nice_chunk size need to be set
   * and queried under the protection of sv_mutex

diff --cc win32/win32thread.h
index 38e66e9,0d92ffc..591184b
--- 1/win32/win32thread.h
--- 2/win32/win32thread.h
+++ b/win32/win32thread.h
@@@ -109,7 -109,7 +109,7 @@@ typedef THREAD_RET_TYPE thread_func_t(v
  START_EXTERN_C
  
  #if defined(PERLDLL) && (!defined(__BORLANDC__) || defined(_DLL))
--extern __declspec(thread) struct thread *Perl_current_thread;
++extern __declspec(thread) struct perl_thread *Perl_current_thread;
  #define SET_THR(t)            (Perl_current_thread = t)
  #define THR                   Perl_current_thread
  #else
@@@ -118,11 -118,10 +118,11 @@@
  #endif
  
  void Perl_alloc_thread_key _((void));
- int Perl_thread_create _((struct thread *thr, thread_func_t *fn));
- void Perl_set_thread_self _((struct thread *thr));
- struct thread *Perl_getTHR _((void));
- void Perl_setTHR _((struct thread *t));
+ int Perl_thread_create _((struct perl_thread *thr, thread_func_t *fn));
+ void Perl_set_thread_self _((struct perl_thread *thr));
+ struct perl_thread *Perl_getTHR _((void));
+ void Perl_setTHR _((struct perl_thread *t));
 +
  END_EXTERN_C
  
  #define INIT_THREADS NOOP