Ubuntu 12.04 and perl 5.14

[KLS]

Index: world/EQWParser.cpp
===================================================================
--- world/EQWParser.cpp	(revision 2139)
+++ world/EQWParser.cpp	(working copy)
@@ -29,11 +29,9 @@
 
 using namespace std;
 
-#if _MSC_VER >= 1600
 #ifndef GvCV_set
 #define GvCV_set(gv,cv)   (GvCV(gv) = (cv))
 #endif
-#endif
 
 #ifdef _WINDOWS
 #if _MSC_VER >= 1600 // for V100+ toolset
@@ -110,18 +108,10 @@
 	eval_pv("sub my_sleep {}",TRUE);
 	if(gv_stashpv("CORE::GLOBAL", FALSE)) {
 		GV *exitgp = gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PVCV);
-		#if _MSC_VER >= 1600
 		GvCV_set(exitgp, perl_get_cv("my_exit", TRUE));	//dies on error
-		#else
-		GvCV(exitgp) = perl_get_cv("my_exit", TRUE);	//dies on error
-		#endif
 		GvIMPORTED_CV_on(exitgp);
 		GV *sleepgp = gv_fetchpv("CORE::GLOBAL::sleep", TRUE, SVt_PVCV);
-		#if _MSC_VER >= 1600 
 		GvCV_set(sleepgp, perl_get_cv("my_sleep", TRUE));	//dies on error
-		#else
-		GvCV(sleepgp) = perl_get_cv("my_sleep", TRUE);	//dies on error
-		#endif
 		GvIMPORTED_CV_on(sleepgp);
 	}
 	
Index: zone/embperl.cpp
===================================================================
--- zone/embperl.cpp	(revision 2139)
+++ zone/embperl.cpp	(working copy)
@@ -17,11 +17,11 @@
 #include "embperl.h"
 #include "embxs.h"
 #include "features.h"
-#if _MSC_VER >= 1600
+
+
 #ifndef GvCV_set
 #define GvCV_set(gv,cv)   (GvCV(gv) = (cv))
 #endif
-#endif
 //#pragma message("You may want to ensure that you add perl\\lib\\CORE to your include path")
 //#pragma message("You may want to ensure that your build settings look like `perl -MExtUtils::Embed -e ccopts -e ldopts`")
 //link against your Perl Lib
@@ -155,18 +155,10 @@
 	eval_pv("sub my_sleep {}",TRUE);
 	if(gv_stashpv("CORE::GLOBAL", FALSE)) {
 		GV *exitgp = gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PVCV);
-		#if _MSC_VER >= 1600
 		GvCV_set(exitgp, perl_get_cv("my_exit", TRUE));	//dies on error
-		#else
-		GvCV(exitgp) = perl_get_cv("my_exit", TRUE);	//dies on error
-		#endif
 		GvIMPORTED_CV_on(exitgp);
 		GV *sleepgp = gv_fetchpv("CORE::GLOBAL::sleep", TRUE, SVt_PVCV);
-		#if _MSC_VER >= 1600
 		GvCV_set(sleepgp, perl_get_cv("my_sleep", TRUE));	//dies on error
-		#else
-		GvCV(sleepgp) = perl_get_cv("my_sleep", TRUE);	//dies on error
-		#endif
 		GvIMPORTED_CV_on(sleepgp);
 	}

I haven't been able to try it, it should resolve the GvCV no longer being a lvalue issue for platforms not => msvc10. Let me know though, I don't want to commit it if it breaks anything.