Merge from 3.3.

2014-01-20 15:35:38 +01:00 · 2014-01-20 15:35:38 +01:00 · 34e4628453
commit 34e4628453
parent 5a6d4bf671 6c01e38677
2 changed files with 3 additions and 1 deletions
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -562,6 +562,7 @@ Randall Hopper
 Nadav Horesh
 Alon Horev
 Jan Hosang
+Alan Hourihane
 Ken Howard
 Brad Howes
 Mike Hoy
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@ -1,11 +1,12 @@
 #include "Python.h"
 #include "osdefs.h"
+#include <locale.h>
+
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #endif

 #ifdef HAVE_LANGINFO_H
-#include <locale.h>
 #include <langinfo.h>
 #endif