diff -ru Python-3.0~/Modules/getpath.c Python-3.0/Modules/getpath.c
--- Python-3.0~/Modules/getpath.c	2008-09-09 13:56:11.000000000 +0000
+++ Python-3.0/Modules/getpath.c	2008-12-04 18:08:19.000000000 +0000
@@ -129,7 +129,7 @@
 static wchar_t exec_prefix[MAXPATHLEN+1];
 static wchar_t progpath[MAXPATHLEN+1];
 static wchar_t *module_search_path = NULL;
-static wchar_t lib_python[] = L"lib/python" VERSION;
+static wchar_t *lib_python = L"lib/python" VERSION;
 
 /* In principle, this should use HAVE__WSTAT, and _wstat
    should be detected by autoconf. However, no current
diff -ru Python-3.0~/Python/pythonrun.c Python-3.0/Python/pythonrun.c
--- Python-3.0~/Python/pythonrun.c	2008-11-22 22:18:04.000000000 +0000
+++ Python-3.0/Python/pythonrun.c	2008-12-04 18:04:48.000000000 +0000
@@ -173,7 +173,7 @@
 		return;
 	initialized = 1;
 
-#ifdef HAVE_SETLOCALE
+#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE)
 	/* Set up the LC_CTYPE locale, so we can obtain
 	   the locale's charset without having to switch
 	   locales. */