diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-14 06:03:50 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-14 06:03:50 +0000 |
| commit | 02c45c47911841b1dd690d10a4f7a2f267e0a83b (patch) | |
| tree | e1d6df2e818ccc63f5baba4579af47009a6b33f7 | |
| parent | 03c9e98c6c70e5eea837fb8c7958e5a8e04b9ad4 (diff) | |
| download | perl-02c45c47911841b1dd690d10a4f7a2f267e0a83b.tar.gz | |
[win32] merge changes#752,753 from maintbranch
p4raw-link: @753 on //depot/maint-5.004/perl: d1828021020f24bd64418fabe04b27e70428ad8d
p4raw-link: @752 on //depot/maint-5.004/perl: 34b6b77de831d6635128d32b913e21377b083965
p4raw-id: //depot/win32/perl@932
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | ext/GDBM_File/GDBM_File.pm | 2 | ||||
| -rw-r--r-- | ext/SDBM_File/sdbm/Makefile.PL | 6 | ||||
| -rw-r--r-- | pod/perlsyn.pod | 2 | ||||
| -rw-r--r-- | t/op/pos.t | 16 |
5 files changed, 28 insertions, 7 deletions
@@ -76,11 +76,10 @@ or if you have any problems building.) 2) Read the manual entries before running perl. 3) IMPORTANT! Help save the world! Communicate any problems and suggested -patches to me, larry@wall.org (Larry Wall), so we can -keep the world in sync. If you have a problem, there's someone else -out there who either has had or will have the same problem. -It's usually helpful if you send the output of the "myconfig" script -in the main perl directory. +patches to perlbug@perl.com so we can keep the world in sync. +If you have a problem, there's someone else out there who either has had +or will have the same problem. It's usually helpful if you send the +output of the "myconfig" script in the main perl directory. If you've succeeded in compiling perl, the perlbug script in the utils/ subdirectory can be used to help mail in a bug report. diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm index 9c7ae066b7..09df4373fb 100644 --- a/ext/GDBM_File/GDBM_File.pm +++ b/ext/GDBM_File/GDBM_File.pm @@ -7,7 +7,7 @@ GDBM_File - Perl5 access to the gdbm library. =head1 SYNOPSIS use GDBM_File ; - tie %hash, 'GDBM_File', $filename, &GDBM_WRCREAT, 0640); + tie %hash, 'GDBM_File', $filename, &GDBM_WRCREAT, 0640; # Use the %hash array. untie %hash ; diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL index 24074afb85..6003628247 100644 --- a/ext/SDBM_File/sdbm/Makefile.PL +++ b/ext/SDBM_File/sdbm/Makefile.PL @@ -37,5 +37,11 @@ config :: lint: lint -abchx $(LIBSRCS) + +# This is a workaround, the problem is that our old GNU make exports +# variables into the environment so $(MYEXTLIB) is set in here to this +# value which can not be built. +sdbm/libsdbm.a: + true '; } diff --git a/pod/perlsyn.pod b/pod/perlsyn.pod index 205be7d97a..ebaa3b22e3 100644 --- a/pod/perlsyn.pod +++ b/pod/perlsyn.pod @@ -47,7 +47,7 @@ subroutine without defining it by saying C<sub name>, thus: Note that it functions as a list operator, not as a unary operator; so be careful to use C<or> instead of C<||> in this case. However, if you were to declare the subroutine as C<sub myname ($)>, then -C<myname> would functonion as a unary operator, so either C<or> or +C<myname> would function as a unary operator, so either C<or> or C<||> would work. Subroutines declarations can also be loaded up with the C<require> statement diff --git a/t/op/pos.t b/t/op/pos.t new file mode 100644 index 0000000000..46811b7bbc --- /dev/null +++ b/t/op/pos.t @@ -0,0 +1,16 @@ +#!./perl + +print "1..3\n"; + +$x='banana'; +$x=~/.a/g; +if (pos($x)==2) {print "ok 1\n"} else {print "not ok 1\n";} + +$x=~/.z/gc; +if (pos($x)==2) {print "ok 2\n"} else {print "not ok 2\n";} + +sub f { my $p=$_[0]; return $p } + +$x=~/.a/g; +if (f(pos($x))==4) {print "ok 3\n"} else {print "not ok 3\n";} + |