diff -N'urpax*~' -x'*.orig' -x'*.rej' xbmc-pvr-testing2-26907/xbmc/lib/libPython/XBPythonDll.cpp xbmc-pvr-testing2-26907-linkpy/xbmc/lib/libPython/XBPythonDll.cpp
--- xbmc-pvr-testing2-26907/xbmc/lib/libPython/XBPythonDll.cpp	2010-01-10 11:42:32.501421000 +0200
+++ xbmc-pvr-testing2-26907-linkpy/xbmc/lib/libPython/XBPythonDll.cpp	2010-01-17 00:35:17.558832043 +0200
@@ -80,7 +80,7 @@ extern "C"
   FUNCTION(PyLong_AsLong)
   FUNCTION(PyLong_AsLongLong)
   FUNCTION(PyErr_Format)
-#if !defined(_LINUX)
+#if 1
   FUNCTION(PyUnicodeUCS2_AsUnicode)
 #else
   FUNCTION(PyUnicodeUCS4_AsUnicode)
@@ -191,7 +191,7 @@ extern "C"
       dll.ResolveExport(DLL_FUNCTION(PyLong_AsLong)) &&
       dll.ResolveExport(DLL_FUNCTION(PyLong_AsLongLong)) &&
       dll.ResolveExport(DLL_FUNCTION(PyErr_Format)) &&
-#if !defined(_LINUX)
+#if 1
       dll.ResolveExport(DLL_FUNCTION(PyUnicodeUCS2_AsUnicode)) &&
 #else
       dll.ResolveExport(DLL_FUNCTION(PyUnicodeUCS4_AsUnicode)) &&
diff -N'urpax*~' -x'*.orig' -x'*.rej' xbmc-pvr-testing2-26907/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-pvr-testing2-26907-linkpy/xbmc/lib/libPython/XBPythonDllFuncs.S
--- xbmc-pvr-testing2-26907/xbmc/lib/libPython/XBPythonDllFuncs.S	2010-01-10 11:42:32.501421000 +0200
+++ xbmc-pvr-testing2-26907-linkpy/xbmc/lib/libPython/XBPythonDllFuncs.S	2010-01-17 00:35:28.662380559 +0200
@@ -79,7 +79,7 @@
   FUNCTION(PyLong_AsLong)
   FUNCTION(PyLong_AsLongLong)
   FUNCTION(PyErr_Format)
-#if !defined(_LINUX)
+#if 1
   FUNCTION(PyUnicodeUCS2_AsUnicode)
 #else
   FUNCTION(PyUnicodeUCS4_AsUnicode)
diff -N'urpax*~' -x'*.orig' -x'*.rej' xbmc-pvr-testing2-26907/xbmc/win32/WIN32XBPythonDll.cpp xbmc-pvr-testing2-26907-linkpy/xbmc/win32/WIN32XBPythonDll.cpp
--- xbmc-pvr-testing2-26907/xbmc/win32/WIN32XBPythonDll.cpp	2009-12-27 23:13:31.784222000 +0200
+++ xbmc-pvr-testing2-26907-linkpy/xbmc/win32/WIN32XBPythonDll.cpp	2010-01-17 00:36:03.077981183 +0200
@@ -196,7 +196,7 @@ extern "C"
     va_end(va);
     return ret;
   }*/
-#ifndef _LINUX
+#if 1
   FUNCTION4(PyUnicodeUCS2_AsUnicode)
 #else
   FUNCTION4(PyUnicodeUCS4_AsUnicode)
@@ -321,7 +321,7 @@ extern "C"
       dll.ResolveExport(DLL_FUNCTION(PyLong_AsLong)) &&
       dll.ResolveExport(DLL_FUNCTION(PyLong_AsLongLong)) &&
       dll.ResolveExport(DLL_VA_FUNCTION(PyErr_Format)) &&
-#ifndef _LINUX
+#if 1
       dll.ResolveExport(DLL_FUNCTION(PyUnicodeUCS2_AsUnicode)) &&
 #else
       dll.ResolveExport(DLL_FUNCTION(PyUnicodeUCS4_AsUnicode)) &&