Require Perl 5.6 and use XSLoader

diff --git a/perl/FCGI.pm b/perl/FCGI.pm
index df678cb..c0bb3b0 100644 (file)
--- a/perl/FCGI.pm
+++ b/perl/FCGI.pm
@@ -1,24 +1,24 @@
 package FCGI;
+use strict;
 
-require Exporter;
-require DynaLoader;
+BEGIN {
+    our $VERSION = '0.73';
 
-@ISA = qw(Exporter DynaLoader);
-
-$VERSION = '0.73';
-
-bootstrap FCGI;
+    require XSLoader;
+    XSLoader::load(__PACKAGE__, $VERSION);
+}
 
-*FAIL_ACCEPT_ON_INTR = sub() { 1 };
+sub FAIL_ACCEPT_ON_INTR () { 1 };
 
 sub Request(;***$*$) {
-    my @defaults = (\*STDIN, \*STDOUT, \*STDERR, \%ENV, 0, FAIL_ACCEPT_ON_INTR());
+    my @defaults = (\*STDIN, \*STDOUT, \*STDERR, \%ENV, 0, FAIL_ACCEPT_ON_INTR);
     $_[4] = fileno($_[4]) if defined($_[4]) && defined(fileno($_[4]));
     splice @defaults,0,@_,@_;
-    RequestX(@defaults);
+    &RequestX(@defaults);
 }
 
 package FCGI::Stream;
+use strict;
 
 sub PRINTF {
   shift->PRINT(sprintf(shift, @_));

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index a7b5be3..b3b7db7 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -1,5 +1,6 @@
 # $Id: Makefile.PL,v 1.33 2002/12/15 19:40:19 skimo Exp $
 
+use 5.006;
 use ExtUtils::MakeMaker;
 use IO::File;
 use Config;
@@ -107,6 +108,7 @@ WriteMakefile(
     'clean'        => { FILES => 'config.cache fcgi_config.h' .
                       ' FCGI.c ' },
     PM            => {'FCGI.pm' => '$(INST_ARCHLIBDIR)/FCGI.pm'},
+    PREREQ_PM     => {'XSLoader' => '0'},
     @extras,
 );