Merge from 3.3.

34e46284 · Stefan Krah · 5a6d4bf6 · 6c01e386 · 34e46284 · 34e46284
Commit 34e46284 authored Jan 20, 2014 by Stefan Krah
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Misc/ACKS Misc/ACKS +1 -0

Python/fileutils.c Python/fileutils.c +2 -1

No files found.
--- 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
 #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