DJGPP tweaks from Laszlo.

p4raw-id: //depot/perl@15650

diff --git a/lib/ExtUtils/MM_DOS.pm b/lib/ExtUtils/MM_DOS.pm
index 3481ac1..7af868e 100644 (file)
--- a/lib/ExtUtils/MM_DOS.pm
+++ b/lib/ExtUtils/MM_DOS.pm
@@ -5,13 +5,14 @@ use vars qw($VERSION @ISA);
 
 $VERSION = 0.01;
 
-require ExtUtils::MM_Win32;
-@ISA = qw(ExtUtils::MM_Win32);
+require ExtUtils::MM_Any;
+require ExtUtils::MM_Unix;
+@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
 
 
 =head1 NAME
 
-ExtUtils::MM_DOS - DOS specific subclass of ExtUtils::MM_Win32
+ExtUtils::MM_DOS - DOS specific subclass of ExtUtils::MM_Unix
 
 =head1 SYNOPSIS
 
@@ -20,10 +21,10 @@ ExtUtils::MM_DOS - DOS specific subclass of ExtUtils::MM_Win32
 
 =head1 DESCRIPTION
 
-This is a subclass of ExtUtils::MM_Win32 which contains functionality
+This is a subclass of ExtUtils::MM_Unix which contains functionality
 for DOS.
 
-Unless otherwise stated, it works just like ExtUtils::MM_Win32
+Unless otherwise stated, it works just like ExtUtils::MM_Unix
 
 =head2 Overridden methods
 
@@ -48,6 +49,7 @@ Michael G Schwern <schwern@pobox.com> with code from ExtUtils::MM_Unix
 
 =head1 SEE ALSO
 
-L<ExtUtils::MM_Win32>, L<ExtUtils::MakeMaker>
+L<ExtUtils::MM_Unix>, L<ExtUtils::MakeMaker>
 
+=cut
 1;

diff --git a/util.c b/util.c
index 7843507..d4a775b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -4299,7 +4299,11 @@ Perl_my_socketpair (int family, int type, int protocol, int fd[2]) {
  * to the my_socketpair in global.sym. */
 int
 Perl_my_socketpair (int family, int type, int protocol, int fd[2]) {
+#ifdef HAS_SOCKETPAIR
     return socketpair(family, type, protocol, fd);
+#else
+    return -1;
+#endif
 }
 #endif