diff --git a/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp b/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp
index 5aa74830844..d595651098c 100644
--- a/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp
+++ b/mozilla/extensions/python/xpcom/src/loader/pyloader.cpp
@@ -105,7 +105,7 @@ void AddStandardPaths()
 	// And now try and get Python to process this directory as a "site dir" 
 	// - ie, look for .pth files, etc
 	nsCAutoString cmdBuf(NS_LITERAL_CSTRING("import site;site.addsitedir(r'") + pathCBuf + NS_LITERAL_CSTRING("')\n"));
-	if (0 != PyRun_SimpleString(cmdBuf.get())) {
+	if (0 != PyRun_SimpleString((char *)cmdBuf.get())) {
 		LogError("The directory '%s' could not be added as a site directory", pathCBuf.get());
 		PyErr_Clear();
 	}
diff --git a/mozilla/extensions/python/xpcom/src/xpcom.cpp b/mozilla/extensions/python/xpcom/src/xpcom.cpp
index 95b5953246e..cbb6aabe8bf 100644
--- a/mozilla/extensions/python/xpcom/src/xpcom.cpp
+++ b/mozilla/extensions/python/xpcom/src/xpcom.cpp
@@ -53,7 +53,7 @@ extern void AddDefaultGateway(PyObject *instance, nsISupports *gateway);
 
 #define LOADER_LINKS_WITH_PYTHON
 
-#ifndef LOADER_LINKS_WITH_PYTHON
+#ifndef PYXPCOM_USE_PYGILSTATE
 extern void PyXPCOM_InterpreterState_Ensure();
 #endif