Integrate:

[ 33344]
Silence warning from VC8 when building without USE_LARGE_FILES

[ 33370]
Silence Borland compiler warnings (except for warnings from zlib) here:
http://www.nntp.perl.org/group/perl.daily-build.reports/2008/02/msg53937.html

[except for Time::Piece, as it's not in a CPAN release yet]
p4raw-link: @33370 on //depot/perl: 0934c9d92d03b9af0e4cebeaa0942ad89e7cc04b
p4raw-link: @33344 on //depot/perl: 3caf316a13f5dcb18f6ada1f6b447887564ff3ae

p4raw-id: //depot/maint-5.10/perl@33590
p4raw-integrated: from //depot/perl@33588 'copy in' win32/win32io.c
	(@24946..) generate_uudmap.c (@31068..) perly.c (@31615..)
	ext/Win32/Win32.pm (@32445..) NetWare/nwperlhost.h
	NetWare/nwperlsys.h (@32713..) iperlsys.h perliol.h (@32793..)
	'merge in' ext/Win32/Win32.xs (@32822..) win32/perlhost.h
	(@33269..) regcomp.c (@33325..)
p4raw-integrated: from //depot/perl@33370 'merge in' win32/win32.c
	(@33291..) perlio.c (@33296..) perl.h (@33336..)

1 files changed, 4 insertions, 4 deletions

diff --git a/regcomp.c b/regcomp.c
index 849733c454..2ee4a3ee81 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -4377,7 +4377,10 @@ reStudy:
     Zero(r->substrs, 1, struct reg_substr_data);
 
 #ifdef TRIE_STUDY_OPT
-    if ( restudied ) {
+    if (!restudied) {
+        StructCopy(&zero_scan_data, &data, scan_data_t);
+        copyRExC_state = RExC_state;
+    } else {
         U32 seen=RExC_seen;
         DEBUG_OPTIMISE_r(PerlIO_printf(Perl_debug_log,"Restudying\n"));
         
@@ -4392,9 +4395,6 @@ reStudy:
 	    SvREFCNT_dec(data.last_found);
 	}
 	StructCopy(&zero_scan_data, &data, scan_data_t);
-    } else {
-        StructCopy(&zero_scan_data, &data, scan_data_t);
-        copyRExC_state = RExC_state;
     }
 #else
     StructCopy(&zero_scan_data, &data, scan_data_t);