X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=NetWare%2Fdl_netware.xs;h=7e11f71c04b59699b2db371ae2ec47491d33ba97;hb=247fb02e864fbacf2e3a11c336199cde6431ca07;hp=11f2444ab2b9ae6cb2865bb59059a2c76fcac490;hpb=acfe0abcedaf592fb4b9cb69ce3468308ae99d91;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/NetWare/dl_netware.xs b/NetWare/dl_netware.xs
index 11f2444..7e11f71 100644
--- 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