build bugs OS/2

Message-ID: <20010519043528.A17363@math.ohio-state.edu>

p4raw-id: //depot/perl@10165

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index c167226..b3b472b 100644 (file)
--- 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 4ce933d..0112900 100644 (file)
--- 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)