summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2014-01-20 14:35:38 (GMT)
committerStefan Krah <skrah@bytereef.org>2014-01-20 14:35:38 (GMT)
commit34e4628453a01330a41c0d0baddc1408a38e5de4 (patch)
treea70a8348bcecc3e14c599034b670f6f4f4b81ecf
parent5a6d4bf671699152fb417e8f8ba899aa5e1d8d42 (diff)
parent6c01e38677550839d10b558b1a9e0e615d6e4a81 (diff)
downloadcpython-34e4628453a01330a41c0d0baddc1408a38e5de4.zip
cpython-34e4628453a01330a41c0d0baddc1408a38e5de4.tar.gz
cpython-34e4628453a01330a41c0d0baddc1408a38e5de4.tar.bz2
Merge from 3.3.
-rw-r--r--Misc/ACKS1
-rw-r--r--Python/fileutils.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 76cc888..b10fcc2 100644
--- 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
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 814f076..a55064f 100644
--- 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