summaryrefslogtreecommitdiff
path: root/os2
diff options
context:
space:
mode:
authorIlya Zakharevich <ilya@math.berkeley.edu>2001-05-19 00:35:28 -0400
committerJarkko Hietaniemi <jhi@iki.fi>2001-05-20 11:07:06 +0000
commite71dd89fd63e118daa683ec46ecbae005acc944d (patch)
tree89aab15906bb0030a5d84ab3137bfaf8e746a5c1 /os2
parent347fb9454d081c2681824ccfe356ab4a77ffa2a5 (diff)
downloadperl-e71dd89fd63e118daa683ec46ecbae005acc944d.tar.gz
build bugs OS/2
Message-ID: <20010519043528.A17363@math.ohio-state.edu> p4raw-id: //depot/perl@10165
Diffstat (limited to 'os2')
-rw-r--r--os2/Makefile.SHs4
-rw-r--r--os2/os2.c11
2 files changed, 6 insertions, 9 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index c167226cef..b3b472b640 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -143,8 +143,8 @@ perl_sys: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs
$(SHRPENV) $(CC) $(SYS_CLDFLAGS) $(CCDLFLAGS) -o perl_sys perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs)
installcmd :
- perl -e 'die qq{Give the option INSTALLCMDDIR=... to make!} if $$ARGV[0] eq ""' $(INSTALLCMDDIR)
- perl os2/perl2cmd.pl $(INSTALLCMDDIR)
+ @perl -e 'die qq{Give the option INSTALLCMDDIR=... to make!} if $$ARGV[0] eq ""' $(INSTALLCMDDIR)
+ ./miniperl -Ilib os2/perl2cmd.pl $(INSTALLCMDDIR)
# Aout section:
diff --git a/os2/os2.c b/os2/os2.c
index 4ce933d81b..0112900152 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -205,18 +205,15 @@ loadByOrd(char *modname, ULONG ord)
{
if (ExtFCN[ord] == NULL) {
static HMODULE hdosc = 0;
- BYTE buf[20];
- PFN fcn;
+ PFN fcn = (PFN)-1;
APIRET rc;
-
- if (!hdosc) {
+ if (!hdosc)
hdosc = loadModule(modname);
- if (CheckOSError(DosQueryProcAddr(hdosc, loadOrd[ord], NULL, &fcn)))
- Perl_croak_nocontext(
+ if (CheckOSError(DosQueryProcAddr(hdosc, loadOrd[ord], NULL, &fcn)))
+ Perl_croak_nocontext(
"This version of OS/2 does not support %s.%i",
modname, loadOrd[ord]);
- }
ExtFCN[ord] = fcn;
}
if ((long)ExtFCN[ord] == -1)