[Python-checkins] python/dist/src/Modules _localemodule.c,2.35,2.36

loewis@users.sourceforge.net loewis@users.sourceforge.net
Tue, 26 Nov 2002 01:05:38 -0800


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv20873/Modules

Modified Files:
	_localemodule.c 
Log Message:
Patch #632973: Implement _getdefaultlocale for OS X.


Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -d -r2.35 -r2.36
*** _localemodule.c	2 Aug 2002 02:27:13 -0000	2.35
--- _localemodule.c	26 Nov 2002 09:05:36 -0000	2.36
***************
*** 31,35 ****
  #endif
  
! #ifdef macintosh
  #include "macglue.h"
  #endif
--- 31,35 ----
  #endif
  
! #if __APPLE__
  #include "macglue.h"
  #endif
***************
*** 401,405 ****
  #endif
  
! #if defined(macintosh)
  static PyObject*
  PyLocale_getdefaultlocale(PyObject* self)
--- 401,405 ----
  #endif
  
! #if defined(__APPLE__)
  static PyObject*
  PyLocale_getdefaultlocale(PyObject* self)
***************
*** 628,632 ****
    {"strxfrm", (PyCFunction) PyLocale_strxfrm, 
     METH_VARARGS, strxfrm__doc__},
! #if defined(MS_WINDOWS) || defined(macintosh)
    {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS},
  #endif
--- 628,632 ----
    {"strxfrm", (PyCFunction) PyLocale_strxfrm, 
     METH_VARARGS, strxfrm__doc__},
! #if defined(MS_WINDOWS) || defined(__APPLE__)
    {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS},
  #endif