mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge from 3.3.

Browse source
This commit is contained in:
Stefan Krah 2014-01-20 15:35:38 +01:00
commit 34e4628453
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -562,6 +562,7 @@ Randall Hopper
Nadav Horesh Nadav Horesh
Alon Horev Alon Horev
Jan Hosang Jan Hosang
Alan Hourihane
Ken Howard Ken Howard
Brad Howes Brad Howes
Mike Hoy Mike Hoy

3
Python/fileutils.c
View file

@ -1,11 +1,12 @@
#include "Python.h" #include "Python.h"
#include "osdefs.h" #include "osdefs.h"
#include <locale.h>
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
# include <windows.h> # include <windows.h>
#endif #endif
#ifdef HAVE_LANGINFO_H #ifdef HAVE_LANGINFO_H
#include <locale.h>
#include <langinfo.h> #include <langinfo.h>
#endif #endif