Integrate:

[ 19106]
Subject: [PATCH 5.8.1 @19053] OS/2-related patches
Message-ID: <20030331204337.GA3634@math.berkeley.edu>

and regen Configure.
p4raw-link: @19106 on //depot/maint-5.8/perl: 8257dec7ed17c0d4d721411d2a781ceadf724da5

p4raw-id: //depot/perl@19120
p4raw-edited: from //depot/maint-5.8/perl@19118 'edit in' embedvar.h
	(@18804..)
p4raw-integrated: from //depot/maint-5.8/perl@19118 'copy in'
	os2/Makefile.SHs os2/OS2/ExtAttr/Changes
	os2/OS2/ExtAttr/ExtAttr.pm os2/OS2/PrfDB/Changes
	os2/OS2/PrfDB/PrfDB.pm os2/OS2/REXX/DLL/DLL.pm
	os2/OS2/REXX/REXX.pm os2/dl_os2.c os2/os2thread.h (@17645..)
	ext/threads/threads.xs (@18619..) perlio.c (@18948..)
	Makefile.SH (@19061..) 'ignore' embed.pl (@18872..) embed.h
	(@19011..) embed.fnc (@19030..) 'merge in' os2/os2ish.h
	(@17645..) os2/os2.c (@18347..) perlapi.h (@18804..) perlvars.h
	(@18808..) makedef.pl (@18896..) intrpvar.h (@18920..) sv.c
	(@18961..)
p4raw-edited: from //depot/maint-5.8/perl@19106 'edit in' Configure
	(@19040..)
p4raw-integrated: from //depot/maint-5.8/perl@19106 'copy in' reentr.h
	(@18850..) reentr.c reentr.pl (@18922..)

6 files changed, 24 insertions, 37 deletions

diff --git a/os2/OS2/ExtAttr/Changes b/os2/OS2/ExtAttr/Changes
index 55fdc5f6d5..92b51826cc 100644
--- a/os2/OS2/ExtAttr/Changes
+++ b/os2/OS2/ExtAttr/Changes
@@ -3,3 +3,5 @@ Revision history for Perl extension OS2::ExtAttr.
 0.01  Sun Apr 21 11:07:04 1996
 	- original version; created by h2xs 1.16
 
+0.02  Update to XSLoader and 'our'.
+      Remove Exporter.
diff --git a/os2/OS2/ExtAttr/ExtAttr.pm b/os2/OS2/ExtAttr/ExtAttr.pm
index bebbcc963e..c49f1d4de5 100644
--- a/os2/OS2/ExtAttr/ExtAttr.pm
+++ b/os2/OS2/ExtAttr/ExtAttr.pm
@@ -1,21 +1,10 @@
 package OS2::ExtAttr;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT);
+use XSLoader;
 
-require Exporter;
-require DynaLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
-	
-);
-$VERSION = '0.01';
-
-bootstrap OS2::ExtAttr $VERSION;
+our $VERSION = '0.02';
+XSLoader::load 'OS2::ExtAttr', $VERSION;
 
 # Preloaded methods go here.
 
diff --git a/os2/OS2/PrfDB/Changes b/os2/OS2/PrfDB/Changes
index 3e8bf3f580..49ac8c1a43 100644
--- a/os2/OS2/PrfDB/Changes
+++ b/os2/OS2/PrfDB/Changes
@@ -3,3 +3,4 @@ Revision history for Perl extension OS2::PrfDB.
 0.01  Tue Mar 26 19:35:27 1996
 	- original version; created by h2xs 1.16
 0.02:  Field do-not-close added to OS2::Prf::Hini.
+0.03:  Update to XSLoader and 'our'.
diff --git a/os2/OS2/PrfDB/PrfDB.pm b/os2/OS2/PrfDB/PrfDB.pm
index 41d7dba2f1..328f4dcd5d 100644
--- a/os2/OS2/PrfDB/PrfDB.pm
+++ b/os2/OS2/PrfDB/PrfDB.pm
@@ -1,21 +1,22 @@
 package OS2::PrfDB;
 
 use strict;
-use vars qw($VERSION @ISA @EXPORT);
 
 require Exporter;
-require DynaLoader;
+use XSLoader;
+use Tie::Hash;
 
-@ISA = qw(Exporter DynaLoader);
+our $debug;
+our @ISA = qw(Exporter Tie::Hash);
 # Items to export into callers namespace by default. Note: do not export
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
-@EXPORT = qw(
-	     AnyIni UserIni SystemIni
-	    );
-$VERSION = '0.02';
+our @EXPORT = qw(
+		 AnyIni UserIni SystemIni
+		);
+our $VERSION = '0.03';
 
-bootstrap OS2::PrfDB $VERSION;
+XSLoader::load 'OS2::PrfDB', $VERSION;
 
 # Preloaded methods go here.
 
@@ -32,10 +33,6 @@ sub SystemIni {
   new_from_int OS2::PrfDB::Hini OS2::Prf::System(2),'System settings database',1;
 }
 
-use vars qw{$debug @ISA};
-use Tie::Hash;
-push @ISA, qw{Tie::Hash};
-
 # Internal structure 0 => HINI, 1 => array of entries, 2 => iterator.
 
 sub TIEHASH {
@@ -127,9 +124,10 @@ sub DESTROY {
 }
 
 package OS2::PrfDB::Sub;
-use vars qw{$debug @ISA};
 use Tie::Hash;
-@ISA = qw{Tie::Hash};
+
+our $debug;
+our @ISA = qw{Tie::Hash};
 
 # Internal structure 0 => HINI, 1 => array of entries, 2 => iterator,
 # 3 => appname.
diff --git a/os2/OS2/REXX/DLL/DLL.pm b/os2/OS2/REXX/DLL/DLL.pm
index f9be9e433c..09e3e37a08 100644
--- a/os2/OS2/REXX/DLL/DLL.pm
+++ b/os2/OS2/REXX/DLL/DLL.pm
@@ -3,9 +3,7 @@ package OS2::DLL;
 our $VERSION = '1.00';
 
 use Carp;
-use DynaLoader;
-
-@ISA = qw(DynaLoader);
+use XSLoader;
 
 sub AUTOLOAD {
     $AUTOLOAD =~ /^OS2::DLL::.+::(.+)$/
@@ -86,7 +84,7 @@ EOE
 	return 1;
 }
 
-bootstrap OS2::DLL;
+XSLoader::load 'OS2::DLL';
 
 1;
 __END__
diff --git a/os2/OS2/REXX/REXX.pm b/os2/OS2/REXX/REXX.pm
index 57e6d6d1a4..88b624f233 100644
--- a/os2/OS2/REXX/REXX.pm
+++ b/os2/OS2/REXX/REXX.pm
@@ -1,18 +1,17 @@
 package OS2::REXX;
 
-use Carp;
 require Exporter;
-require DynaLoader;
+use XSLoader;
 require OS2::DLL;
 
-@ISA = qw(Exporter DynaLoader);
+@ISA = qw(Exporter);
 # Items to export into callers namespace by default
 # (move infrequently used names to @EXPORT_OK below)
 @EXPORT = qw(REXX_call REXX_eval REXX_eval_with);
 # Other items we are prepared to export if requested
 @EXPORT_OK = qw(drop register);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 # We cannot just put OS2::DLL in @ISA, since some scripts would use
 # function interface, not method interface...
@@ -21,7 +20,7 @@ $VERSION = '1.01';
 *load = \&OS2::DLL::load;
 *find = \&OS2::DLL::find;
 
-bootstrap OS2::REXX;
+XSLoader::load 'OS2::REXX';
 
 # Preloaded methods go here.  Autoload methods go after __END__, and are
 # processed by the autosplit program.