--- ut_PerlBindings.cpp.orig	2002-09-06 18:33:28.000000000 +0900
+++ ut_PerlBindings.cpp	2002-09-06 15:52:40.000000000 +0900
@@ -57,21 +57,21 @@
 #endif
 
 extern "C" {
-//	void boot_DynaLoader (pTHXo_ CV* cv);
-//	void boot_AbiWord (pTHXo_ CV* cv);
-	void xs_init();
-	void boot_DynaLoader(CV* cv);
-//	void boot_AbiWord(CV* cv);
-
-//	void xs_init (pTHXo) {
-	void xs_init()
-	{
-		char *file = __FILE__;
-		newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-		/* we want to link to the module code, but until it's stable
-		   it's better to have it dynamically loaded...
-		   newXS("abi::boot_AbiWord", boot_AbiWord, file);*/
-	}
+  
+  void boot_DynaLoader(PerlInterpreter *pi, CV* cv);
+  
+#ifdef NOT_PERL_5_8
+  void xs_init()
+#else
+    void xs_init(PerlInterpreter * my_perl)
+#endif
+  {
+    char *file = __FILE__;
+    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+    /* we want to link to the module code, but until it's stable
+       it's better to have it dynamically loaded...
+       newXS("abi::boot_AbiWord", boot_AbiWord, file);*/
+  }
 }
 
 //////////////////////////////////////////////////
@@ -145,6 +145,10 @@
 bool
 UT_PerlBindings::evalFile(const UT_String& filename)
 {
+#ifndef NOT_PERL_5_8
+  PerlInterpreter * my_perl = impl_->pPerlInt;
+#endif
+
 	UT_String code("require \"");
 
 	for (size_t i = 0; i < filename.size(); ++i)
@@ -208,10 +212,14 @@
 bool
 UT_PerlBindings::runCallback(const char* method)
 {
+#ifndef NOT_PERL_5_8
+  PerlInterpreter * my_perl = impl_->pPerlInt;
+#endif
+
 	dSP;
 	PUSHMARK(SP);
 	perl_call_pv(const_cast<char*> (method),
-				 G_VOID | G_DISCARD | G_NOARGS /* | G_EVAL */ );
+			 G_VOID | G_DISCARD | G_NOARGS /* | G_EVAL */ );
 
 	if (SvTRUE(ERRSV))
 	{
@@ -252,9 +260,6 @@
 	}
 
 	app->getMenuActionSet()->addAction(new EV_Menu_Action(id, false, bRaisesDialog, false, "executeScript", 0, 0, pszFunctionName));
-	// const EV_EditEventMapper * pEEM = pUnixFrame->getEditEventMapper();
-	// UT_ASSERT(pEEM);
-	// const char * string = pEEM->getShortcutFor(pEM);
 }
 
 /***************************************************************************/