<pre style='margin:0'>
Jyrki Wahlstedt (jyrkiwahlstedt) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc2720b2af61843a8d7ba0ad74cd75f285efaa6f">https://github.com/macports/macports-ports/commit/bc2720b2af61843a8d7ba0ad74cd75f285efaa6f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bc2720b2af61843a8d7ba0ad74cd75f285efaa6f
</span>Author: Jyrki Wahlstedt <jwa@macports.org>
AuthorDate: Sun Dec 18 13:32:05 2016 +0200
<span style='display:block; white-space:pre;color:#404040;'> python27: remove patch files merged upstream
</span>---
.../python27/files/improve-QuickTime.h-check.patch | 1179 --------------------
lang/python27/files/omit-local-site-packages.patch | 20 -
lang/python27/files/patch-Include-pyport.h.diff | 25 -
3 files changed, 1224 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/improve-QuickTime.h-check.patch b/lang/python27/files/improve-QuickTime.h-check.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bdd3867..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/improve-QuickTime.h-check.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,1179 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://hg.python.org/cpython/rev/4030300fcb18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User sashk <b@compuix.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1474031325 14400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 4030300fcb1885f3f827bd55f22e05720cfa6edb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent c38e10ad7c898aac1bc276b04abcecb03c97d71a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Issue #27806: Fix 32-bit builds on macOS Sierra 10.12 broken by removal of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-deprecated QuickTime/QuickTime.h header file. Patch by sashk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Include/pymactoolbox.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pymactoolbox.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pymactoolbox.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,9 +9,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+** Issue #27806: Workaround for gcc 4.x which does not have _has_include.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __has_include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __has_include(x) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Workaround */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __has_include(<Availability.h>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define APPLE_SUPPORTS_QUICKTIME (__MAC_OS_X_VERSION_MAX_ALLOWED < 101200) && !__LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define APPLE_SUPPORTS_QUICKTIME !__LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/QuickTime.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** Helper routines for error codes and such.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,10 +36,10 @@ extern PyObject *PyMac_OSErrException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fsspec->path */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** These conversion routines are defined in mactoolboxglue.c itself.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,54 +124,54 @@ extern PyObject *CmpInstObj_New(Componen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Ctl exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *CtlObj_New(ControlHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int CtlObj_Convert(PyObject *, ControlHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Dlg exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DlgObj_New(DialogPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int DlgObj_Convert(PyObject *, DialogPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DlgObj_WhichDialog(DialogPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Drag exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DragObj_New(DragReference);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int DragObj_Convert(PyObject *, DragReference *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* List exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *ListObj_New(ListHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int ListObj_Convert(PyObject *, ListHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Menu exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MenuObj_New(MenuHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int MenuObj_Convert(PyObject *, MenuHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qd exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *GrafObj_New(GrafPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int GrafObj_Convert(PyObject *, GrafPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *BMObj_New(BitMapPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int BMObj_Convert(PyObject *, BitMapPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *QdRGB_New(RGBColor *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int QdRGB_Convert(PyObject *, RGBColor *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qdoffs exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *GWorldObj_New(GWorldPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qt exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *TrackObj_New(Track);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int TrackObj_Convert(PyObject *, Track *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MovieObj_New(Movie);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,7 +184,7 @@ extern PyObject *UserDataObj_New(UserDat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int UserDataObj_Convert(PyObject *, UserData *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MediaObj_New(Media);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int MediaObj_Convert(PyObject *, Media *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Res exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *ResObj_New(Handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -178,17 +193,17 @@ extern PyObject *OptResObj_New(Handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int OptResObj_Convert(PyObject *, Handle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* TE exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *TEObj_New(TEHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int TEObj_Convert(PyObject *, TEHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Win exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *WinObj_New(WindowPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int WinObj_Convert(PyObject *, WindowPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *WinObj_WhichWindow(WindowPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CF exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *CFObj_New(CFTypeRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/ColorPickermodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/ColorPickermodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/ColorPickermodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@ PERFORMANCE OF THIS SOFTWARE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ----------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char cp_GetColor__doc__[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GetColor(prompt, (r, g, b)) -> (r, g, b), ok"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,14 +49,14 @@ cp_GetColor(PyObject *self, PyObject *ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_BuildValue("O&h", QdRGB_New, &outColor, ok);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* List of methods defined in the module */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct PyMethodDef cp_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetColor", (PyCFunction)cp_GetColor, METH_VARARGS, cp_GetColor__doc__},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, (PyCFunction)NULL, 0, NULL} /* sentinel */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,4 +87,3 @@ void initColorPicker(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyErr_Occurred())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_FatalError("can't initialize module ColorPicker");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/MacOS.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/MacOS.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/MacOS.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@ MacOS_GetCreatorAndType(PyObject *self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FileInfo* finfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This function is documented to take an FSSpec as well,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * which only works in 32-bit mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,9 +324,9 @@ MacOS_GetCreatorAndType(PyObject *self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(creator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = FSGetCatalogInfo(&ref,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,7 +372,7 @@ MacOS_SetCreatorAndType(PyObject *self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, "O&O&O&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Try to handle FSSpec arguments, for backward compatibility */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FInfo info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,9 +391,9 @@ MacOS_SetCreatorAndType(PyObject *self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(Py_None);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = FSGetCatalogInfo(&ref,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/OSATerminology.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/OSATerminology.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/OSATerminology.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyOSA_GetAppTerminology(PyObject* self, PyObject* args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,14 +73,14 @@ PyOSA_GetSysTerminology(PyObject* self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err) return PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_BuildValue("O&", AEDesc_New, &theDesc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * List of methods defined in the module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct PyMethodDef OSATerminology_methods[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetAppTerminology",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyCFunction) PyOSA_GetAppTerminology,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- METH_VARARGS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@ static struct PyMethodDef OSATerminology
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (PyCFunction) PyOSA_GetSysTerminology,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- METH_VARARGS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Get the AppleScript language's terminology. GetSysTerminology() --> AEDesc"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, (PyCFunction) NULL, 0, NULL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/app/_Appmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/app/_Appmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/app/_Appmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,13 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _App =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Carbon GUI stuff, not available in 64-bit mode */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_NotImplementedError, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1806,13 +1804,13 @@ static PyMethodDef App_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_App(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_App", App_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- App_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (App_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1825,7 +1823,7 @@ void init_App(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&ThemeDrawingState_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "ThemeDrawingStateType", (PyObject *)&ThemeDrawingState_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _App ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/carbonevt/_CarbonEvtmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/carbonevt/_CarbonEvtmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/carbonevt/_CarbonEvtmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,10 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================= Module _CarbonEvt ======================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2128,27 +2128,27 @@ static PyMethodDef CarbonEvents_methods[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef CarbonEvents_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_CarbonEvt(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_CarbonEvt", CarbonEvents_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- myEventHandlerUPP = NewEventHandlerUPP(myEventHandler);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CarbonEvents_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2211,7 +2211,7 @@ void init_CarbonEvt(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&EventHotKeyRef_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "EventHotKeyRefType", (PyObject *)&EventHotKeyRef_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ===================== End module _CarbonEvt ====================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/ctl/_Ctlmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/ctl/_Ctlmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/ctl/_Ctlmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Ctl =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5766,19 +5766,19 @@ mytrackingproc(ControlHandle control, Po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (ControlPartCode)c_rv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Ctl_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Ctl(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mytracker_upp = NewControlActionUPP(mytracker);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5791,11 +5791,11 @@ void init_Ctl(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mytrackingproc_upp = NewControlUserPaneTrackingUPP(mytrackingproc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(ControlHandle, CtlObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ControlHandle, CtlObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Ctl", Ctl_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ctl_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Ctl_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5808,8 +5808,7 @@ void init_Ctl(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&Control_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "ControlType", (PyObject *)&Control_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Ctl ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/dlg/_Dlgmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/dlg/_Dlgmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/dlg/_Dlgmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,12 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Dlg =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_NotImplementedError, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1577,7 +1575,7 @@ static PyMethodDef Dlg_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Dlg(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1585,11 +1583,11 @@ void init_Dlg(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(DialogPtr, DlgObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(DialogPtr, DlgObj_WhichDialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DialogPtr, DlgObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Dlg", Dlg_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dlg_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Dlg_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1602,7 +1600,7 @@ void init_Dlg(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&Dialog_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "DialogType", (PyObject *)&Dialog_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Dlg ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/drag/_Dragmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/drag/_Dragmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/drag/_Dragmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,12 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Drag ========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_NotImplementedError, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1117,18 +1115,18 @@ static PyMethodDef Drag_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Drag(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(DragRef, DragObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragRef, DragObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Drag", Drag_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Drag_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Drag_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1150,7 +1148,7 @@ void init_Drag(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dragglue_DrawingUPP = NewDragDrawingUPP(dragglue_Drawing);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/help/_Helpmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/help/_Helpmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/help/_Helpmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,12 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Help ========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_NotImplementedError, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,10 +143,10 @@ static PyObject *Help_HMHideTag(PyObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Help_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"HMGetHelpMenu", (PyCFunction)Help_HMGetHelpMenu, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> (MenuRef outHelpMenu, MenuItemIndex outFirstCustomItemIndex)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"HMAreHelpTagsDisplayed", (PyCFunction)Help_HMAreHelpTagsDisplayed, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,31 +163,30 @@ static PyMethodDef Help_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(DialogPtr inDialog, SInt16 inHdlgRsrcID, SInt16 inItemStart) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"HMHideTag", (PyCFunction)Help_HMHideTag, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Help(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Help", Help_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Help_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Help_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDict_SetItemString(d, "Error", Help_Error) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Help ======================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/ibcarbon/_IBCarbon.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/ibcarbon/_IBCarbon.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/ibcarbon/_IBCarbon.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,12 +2,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== Module _IBCarbon ======================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_TOOLBOX_OBJECT_GLUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,13 +225,13 @@ static PyObject *IBCarbon_CreateNibRefer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IBNibRefObj_New, outNibRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef IBCarbon_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"CreateNibReference", (PyCFunction)IBCarbon_CreateNibReference, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(CFStringRef inNibName) -> (IBNibRef outNibRef)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,16 +241,16 @@ static PyMethodDef IBCarbon_methods[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_IBCarbon(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_IBCarbon", IBCarbon_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IBCarbon_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (IBCarbon_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -263,7 +263,7 @@ void init_IBCarbon(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&IBNibRef_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "IBNibRefType", (PyObject *)&IBNibRef_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ====================== End module _IBCarbon ====================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/icn/_Icnmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/icn/_Icnmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/icn/_Icnmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Icn =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1448,10 +1448,10 @@ static PyObject *Icn_WriteIconFile(PyObj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Icn_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetCIcon", (PyCFunction)Icn_GetCIcon, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(SInt16 iconID) -> (CIconHandle _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"PlotCIcon", (PyCFunction)Icn_PlotCIcon, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1576,7 +1576,7 @@ static PyMethodDef Icn_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef ref) -> (IconFamilyHandle iconFamily)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"WriteIconFile", (PyCFunction)Icn_WriteIconFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(IconFamilyHandle iconFamily, FSSpec iconFile) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1586,21 +1586,21 @@ static PyMethodDef Icn_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Icn(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Icn", Icn_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Icn_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Icn_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDict_SetItemString(d, "Error", Icn_Error) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Icn ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/list/_Listmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/list/_Listmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/list/_Listmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _List ========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1032,10 +1031,10 @@ static PyObject *List_as_List(PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef List_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"CreateCustomList", (PyCFunction)List_CreateCustomList, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Rect rView, Rect dataBounds, Point cellSize, ListDefSpec theSpec, WindowPtr theWindow, Boolean drawIt, Boolean hasGrow, Boolean scrollHoriz, Boolean scrollVert) -> (ListHandle outList)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"LNew", (PyCFunction)List_LNew, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1058,11 +1057,11 @@ static PyMethodDef List_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(ListHandle list, OptionBits selectionFlags) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"as_List", (PyCFunction)List_as_List, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Resource)->List.\nReturns List object (which is not auto-freed!)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void myListDefFunction(SInt16 message,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1100,13 +1099,13 @@ static void myListDefFunction(SInt16 mes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(rv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_List(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1115,11 +1114,11 @@ void init_List(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(ListHandle, ListObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListHandle, ListObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_List", List_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- List_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (List_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1132,7 +1131,7 @@ void init_List(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&List_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "ListType", (PyObject *)&List_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _List ======================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/mlte/_Mltemodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/mlte/_Mltemodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/mlte/_Mltemodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Mlte ========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1623,10 +1622,10 @@ static PyObject *Mlte_TXNInitTextension(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Mlte_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1643,7 +1642,7 @@ static PyMethodDef Mlte_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"TXNInitTextension", (PyCFunction)Mlte_TXNInitTextension, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(TXNInitOptions) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1653,17 +1652,17 @@ static PyMethodDef Mlte_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Mlte(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PyMac_INIT_TOOLBOX_OBJECT_NEW(xxxx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Mlte", Mlte_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mlte_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Mlte_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1683,7 +1682,7 @@ void init_Mlte(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&TXNFontMenuObject_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "TXNFontMenuObjectType", (PyObject *)&TXNFontMenuObject_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Mlte ======================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/qt/_Qtmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/qt/_Qtmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/qt/_Qtmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* =========================== Module _Qt =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26295,10 +26295,10 @@ static PyObject *Qt_MoviesTask(PyObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Qt_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"EnterMovies", (PyCFunction)Qt_EnterMovies, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"ExitMovies", (PyCFunction)Qt_ExitMovies, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27991,7 +27991,7 @@ static PyMethodDef Qt_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(WindowPtr wp, Point startPt, Rect boundsRect) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"MoviesTask", (PyCFunction)Qt_MoviesTask, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(long maxMilliSecToUse) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28001,7 +28001,7 @@ static PyMethodDef Qt_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Qt(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28018,11 +28018,11 @@ void init_Qt(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(UserData, UserDataObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(Media, MediaObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Media, MediaObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Qt", Qt_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Qt_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Qt_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28084,7 +28084,7 @@ void init_Qt(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&SGOutput_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "SGOutputType", (PyObject *)&SGOutput_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================= End module _Qt ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/te/_TEmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/te/_TEmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/te/_TEmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* =========================== Module _TE =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1268,10 +1268,10 @@ static PyObject *TE_as_TE(PyObject *_sel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEObj_New, _rv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef TE_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"TEScrapHandle", (PyCFunction)TE_TEScrapHandle, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> (Handle _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"TEGetScrapLength", (PyCFunction)TE_TEGetScrapLength, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1298,7 +1298,7 @@ static PyMethodDef TE_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(UInt8 value) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"as_TE", (PyCFunction)TE_as_TE, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Handle h) -> (TEHandle _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1308,7 +1308,7 @@ static PyMethodDef TE_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_TE(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1316,10 +1316,10 @@ void init_TE(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(TEHandle, TEObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(TEHandle, TEObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_TE", TE_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TE_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TE_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1332,7 +1332,7 @@ void init_TE(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&TE_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "TEType", (PyObject *)&TE_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================= End module _TE ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/Modules/win/_Winmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/win/_Winmodule.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/win/_Winmodule.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,10 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================== Module _Win =========================== */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Python.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3147,10 +3147,10 @@ static PyObject *Win_FindWindow(PyObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WinObj_WhichWindow, theWindow);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Win_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetNewCWindow", (PyCFunction)Win_GetNewCWindow, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(short windowID, WindowPtr behind) -> (WindowPtr _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"NewWindow", (PyCFunction)Win_NewWindow, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3202,12 +3202,12 @@ static PyMethodDef Win_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FindWindow", (PyCFunction)Win_FindWindow, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Point thePoint) -> (short _rv, WindowPtr theWindow)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL, 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Return the object corresponding to the window, or NULL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3230,22 +3230,22 @@ WinObj_WhichWindow(WindowPtr w)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return it;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_Win(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *m;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_New);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_WhichWindow);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(WindowPtr, WinObj_Convert);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = Py_InitModule("_Win", Win_methods);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyModule_GetDict(m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Win_Error = PyMac_GetOSErrException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Win_Error == NULL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3258,7 +3258,7 @@ void init_Win(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&Window_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "WindowType", (PyObject *)&Window_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================== End module _Win ========================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Misc/NEWS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Misc/NEWS.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Misc/NEWS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,6 +391,9 @@ Build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- Issue #27806: Fix 32-bit builds on macOS Sierra 10.12 broken by removal of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ deprecated QuickTime/QuickTime.h header file. Patch by sashk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tools/Demos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Python/mactoolboxglue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Python/mactoolboxglue.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Python/mactoolboxglue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,7 +106,7 @@ PyMac_Error(OSErr err)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +154,7 @@ PyMac_GetFullPathname(FSSpec *fss, char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_XDECREF(fs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Convert a 4-char string object argument to an OSType value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,7 +419,7 @@ GLUE_CONVERT(RGBColor, QdRGB_Convert, "C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if APPLE_SUPPORTS_QUICKTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,7 +432,7 @@ GLUE_NEW(UserData, UserDataObj_New, "Car
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* APPLE_SUPPORTS_QUICKTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/omit-local-site-packages.patch b/lang/python27/files/omit-local-site-packages.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0345f88..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/omit-local-site-packages.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/site.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/site.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/site.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,15 +295,6 @@ def getsitepackages():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitepackages.append(prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # for framework builds *only* we add the standard Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # locations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from sysconfig import get_config_var
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- framework = get_config_var("PYTHONFRAMEWORK")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if framework:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sitepackages.append(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join("/Library", framework,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.version[:3], "site-packages"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return sitepackages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def addsitepackages(known_paths):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/patch-Include-pyport.h.diff b/lang/python27/files/patch-Include-pyport.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdc7ff1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Include/pyport.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pyport.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pyport.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -713,6 +713,12 @@ extern int fdatasync(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* The workaround below is unsafe in C++ because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the <locale> defines these symbols as real functions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * with a slightly different signature.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * See issue #10910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef isalnum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -730,6 +736,7 @@ extern int fdatasync(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef toupper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define toupper(c) towupper(btowc(c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Declarations for symbol visibility.
</span></pre><pre style='margin:0'>
</pre>