In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/60666776a83addda0a7fcb957c6b5007b8e030f3?hp=5a9a79a4cd93fcfb7398dd4e99030923446e8b08>

- Log -----------------------------------------------------------------
commit 60666776a83addda0a7fcb957c6b5007b8e030f3
Author: Tony Cook <[email protected]>
Date:   Thu Sep 23 20:44:37 2010 +1000

    Make dquote_static.c available to ext/re/
    
    Under Win32 the main perl source directory isn't in the C include
    path, so as we do with the re source files, copy dquote_static.c to
    the ext/re directory.

M       ext/re/Makefile.PL

commit 038ea8ae868b1350e1b0662ded32942e2396b684
Author: Tony Cook <[email protected]>
Date:   Thu Sep 23 20:43:44 2010 +1000

    Configure inline support for 32-bit VC++
    
    VC supports static inline via "static __inline".

M       win32/config.vc
-----------------------------------------------------------------------

Summary of changes:
 ext/re/Makefile.PL |    7 ++++++-
 win32/config.vc    |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index dbc4142..a973352 100644
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -24,13 +24,14 @@ sub upupfile {
 sub postamble {
     my $regcomp_c = upupfile('regcomp.c');
     my $regexec_c = upupfile('regexec.c');
+    my $dquote_static_c = upupfile('dquote_static.c');
 
     <<EOF;
 re_comp.c : $regcomp_c
        - \$(RM_F) re_comp.c
        \$(CP) $regcomp_c re_comp.c
 
-re_comp\$(OBJ_EXT) : re_comp.c
+re_comp\$(OBJ_EXT) : re_comp.c dquote_static.c
 
 re_exec.c : $regexec_c
        - \$(RM_F) re_exec.c
@@ -38,6 +39,10 @@ re_exec.c : $regexec_c
 
 re_exec\$(OBJ_EXT) : re_exec.c
 
+dquote_static.c : $dquote_static_c
+       - \$(RM_F) dquote_static.c
+       \$(CP) $dquote_static_c dquote_static.c
+
 EOF
 }
 
diff --git a/win32/config.vc b/win32/config.vc
index afb86cc..b06b685 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -851,7 +851,7 @@ perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline=''
+perl_static_inline='static __inline'
 pg=''
 phostname='hostname'
 pidtype='int'

--
Perl5 Master Repository

Reply via email to