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

diff --git a/NetWare/dl_netware.xs b/NetWare/dl_netware.xs
index 2f466ca..7e11f71 100644
--- a/NetWare/dl_netware.xs
+++ b/NetWare/dl_netware.xs
@@ -27,23 +27,19 @@ NetWare related modifications done on dl_win32.xs file created by Wei-Yuen Tan t
 //function pointer for UCSInitialize
 typedef void (*PFUCSINITIALIZE) ();
 
-#ifdef PERL_OBJECT
-
-#endif  /* PERL_OBJECT */
-
 #include "dlutils.c"	/* SaveError() etc	*/
 
 static void
-dl_private_init(pTHXo)
+dl_private_init(pTHX)
 {
-    (void)dl_generic_private_init(aTHXo);
+    (void)dl_generic_private_init(aTHX);
 }
 
 
 MODULE = DynaLoader	PACKAGE = DynaLoader
 
 BOOT:
-    (void)dl_private_init(aTHXo);
+    (void)dl_private_init(aTHX);
 
 
 void *
@@ -111,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");
@@ -130,8 +126,8 @@ dl_load_file(filename,flags=0)
 			DLDEBUG(2,PerlIO_printf(Perl_debug_log," libref=%x\n", nlmHandle));
 			ST(0) = sv_newmortal() ;
 			if (nlmHandle == NULL)
-			//SaveError(aTHXo_ "load_file:%s",
-			//	  OS_Error_String(aTHXo)) ;
+			//SaveError(aTHX_ "load_file:%s",
+			//	  OS_Error_String(aTHX)) ;
 			ConsolePrintf("load_file error :  %s\n", mod_name8);
 			else
 			sv_setiv( ST(0), (IV)nlmHandle);
@@ -156,8 +152,8 @@ dl_find_symbol(libhandle, symbolname)
     DLDEBUG(2,PerlIO_printf(Perl_debug_log,"  symbolref = %x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
-	//SaveError(aTHXo_ "find_symbol:%s",
-	//	  OS_Error_String(aTHXo)) ;
+	//SaveError(aTHX_ "find_symbol:%s",
+	//	  OS_Error_String(aTHX)) ;
 	ConsolePrintf("find_symbol error \n");
     else
 	sv_setiv( ST(0), (IV)RETVAL);
@@ -178,14 +174,15 @@ dl_install_xsub(perl_name, symref, filename="$Package")
     DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_install_xsub(name=%s, symref=%x)\n",
 		      perl_name, symref));
     ST(0) = sv_2mortal(newRV((SV*)newXS(perl_name,
-					(void(*)(pTHXo_ CV *))symref,
+					(void(*)(pTHX_ CV *))symref,
 					filename)));
 
 
 char *
 dl_error()
     CODE:
-    RETVAL = LastError ;
+    dMY_CXT;
+    RETVAL = dl_last_error ;
     OUTPUT:
     RETVAL