[Python-checkins] CVS: python/dist/src/Mac/Modules/cf _CFmodule.c,1.5,1.6
Jack Jansen
jackjansen@users.sourceforge.net
2001年11月30日 06:17:04 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/cf
In directory usw-pr-cvs1:/tmp/cvs-serv22285/Mac/Modules/cf
Modified Files:
_CFmodule.c
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
Index: _CFmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cf/_CFmodule.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** _CFmodule.c 2001年11月05日 14:39:05 1.5
--- _CFmodule.c 2001年11月30日 14:16:31 1.6
***************
*** 6,15 ****
- #ifdef _WIN32
- #include "pywintoolbox.h"
- #else
#include "macglue.h"
#include "pymactoolbox.h"
- #endif
/* Macro to test whether a weak-loaded CFM function exists */
[...1061 lines suppressed...]
***************
*** 3042,3046 ****
--- 3224,3230 ----
PyObject *_res = NULL;
CFTypeID _rv;
+ #ifndef CFURLGetTypeID
PyMac_PRECHECK(CFURLGetTypeID);
+ #endif
if (!PyArg_ParseTuple(_args, ""))
return NULL;
***************
*** 3060,3064 ****
--- 3244,3250 ----
CFStringEncoding encoding;
CFURLRef baseURL;
+ #ifndef CFURLCreateWithBytes
PyMac_PRECHECK(CFURLCreateWithBytes);
+ #endif
if (!PyArg_ParseTuple(_args, "s#lO&",
&URLBytes__in__, &URLBytes__in_len__,