[Python-checkins] r74847 - in python/branches/release31-maint: Modules/_localemodule.c

[mark.dickinson]

Author: mark.dickinson
Date: Wed Sep 16 22:33:51 2009
New Revision: 74847

Log:
Merged revisions 74846 via svnmerge from 
svn+ssh://pythondev@www.python.org/python/branches/py3k

................
  r74846 | mark.dickinson | 2009-09-16 21:32:35 +0100 (Wed, 16 Sep 2009) | 11 lines
  
  Merged revisions 74843 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r74843 | mark.dickinson | 2009-09-16 21:26:31 +0100 (Wed, 16 Sep 2009) | 4 lines
    
    Remove outdated include; this include was breaking OS X builds using
    non-Apple gcc4.3 and gcc4.4 (because CoreFoundation/CoreFoundation.h
    won't compile under non-Apple gcc).
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_localemodule.c

Modified: python/branches/release31-maint/Modules/_localemodule.c
==============================================================================
--- python/branches/release31-maint/Modules/_localemodule.c	(original)
+++ python/branches/release31-maint/Modules/_localemodule.c	Wed Sep 16 22:33:51 2009
@@ -32,10 +32,6 @@
 #include <wchar.h>
 #endif
 
-#if defined(__APPLE__)
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 #if defined(MS_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>