summaryrefslogtreecommitdiff
path: root/os2/OS2/PrfDB
diff options
context:
space:
mode:
authorIlya Zakharevich <ilya@math.berkeley.edu>2003-03-31 04:43:37 -0800
committerJarkko Hietaniemi <jhi@iki.fi>2003-04-01 16:32:03 +0000
commit5c728af092d5febae92774d9106a235643cb49e5 (patch)
treef2b54077514f1f871504f57b7633df9dcdb72876 /os2/OS2/PrfDB
parent15978375e3ac30958ab56d2e88249ad742eecd30 (diff)
downloadperl-5c728af092d5febae92774d9106a235643cb49e5.tar.gz
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..)
Diffstat (limited to 'os2/OS2/PrfDB')
-rw-r--r--os2/OS2/PrfDB/Changes1
-rw-r--r--os2/OS2/PrfDB/PrfDB.pm26
2 files changed, 13 insertions, 14 deletions
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.