Integrate mainline

[p5sagit/p5-mst-13.2.git] / NetWare / dl_netware.xs

diff --git a/NetWare/dl_netware.xs b/NetWare/dl_netware.xs
index 11f2444..7e11f71 100644 (file)
--- a/NetWare/dl_netware.xs
+++ b/NetWare/dl_netware.xs
@@ -107,11 +107,11 @@ dl_load_file(filename,flags=0)
                                        nlmHandle = FindNLMHandle(mod_name8);
                                }
                        }
-                       //use UCSExt encountered-
+                       //use Perl2UCS or UCSExt encountered :
                        //initialize UCS, this has to be terminated when the script finishes execution
                        //Is the script intending to use UCS Extensions?
                        //This should be done once per script execution
-                       if (strcmp(mod_name,"Perl2UCS.nlp")==0)
+                       if ((strcmp(mod_name,"Perl2UCS.nlm")==0) || (strcmp(mod_name,"UCSExt.nlm")==0))
                        {
                                unsigned int moduleHandle = 0;
                                moduleHandle = FindNLMHandle("UCSCORE.NLM");
@@ -181,7 +181,8 @@ dl_install_xsub(perl_name, symref, filename="$Package")
 char *
 dl_error()
     CODE:
-    RETVAL = LastError ;
+    dMY_CXT;
+    RETVAL = dl_last_error ;
     OUTPUT:
     RETVAL