Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 59c14e2

Browse files
jackjansenjackjansen
committed
Bit the bullet and enabled garbage collection (finally).
Also updated pyconfig.h to the current state of pyconfig.h.in.
1 parent 230e578 commit 59c14e2

5 files changed

Lines changed: 64 additions & 12 deletions

File tree

‎Mac/Build/PythonCore.exp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,9 @@ PyObject_Compare
479479
PyObject_Unicode
480480
PyObject_Str
481481
PyObject_Repr
482+
_PyGC_Dump
482483
_PyObject_Dump
483484
PyObject_Print
484-
_PyGC_Remove
485-
_PyGC_Insert
486485
_PyObject_Del
487486
_PyObject_NewVar
488487
_PyObject_New
@@ -620,6 +619,7 @@ Py_GetPlatform
620619
PyMac_ConsoleIsDead
621620
PyMac_AppearanceCompliant
622621
PyMac_OSErrException
622+
PyMacGluePtr_PyMac_GetFSSpec
623623
PyMacGluePtr_AEDesc_New
624624
PyMacGluePtr_AEDesc_Convert
625625
PyMacGluePtr_CmpObj_New
@@ -712,6 +712,7 @@ CmpObj_Convert
712712
CmpObj_New
713713
AEDesc_Convert
714714
AEDesc_New
715+
PyMac_GetFSSpec
715716
PyMac_Buildwide
716717
PyMac_Getwide
717718
PyMac_BuildFixed
@@ -788,9 +789,8 @@ initmacfs
788789
PyMac_BuildFSSpec
789790
PyMac_BuildFSRef
790791
PyMac_GetFSRef
791-
newmfsrobject
792792
newmfssobject
793-
PyMac_GetFSSpec
793+
_PyMac_GetFSSpec
794794
initmac
795795
initMacOS
796796
Pcre_Type
@@ -1047,6 +1047,9 @@ PyDescr_NewWrapper
10471047
PyDescr_NewGetSet
10481048
PyDescr_NewMember
10491049
PyDescr_NewMethod
1050+
initgc
1051+
_PyGC_Remove
1052+
_PyGC_Insert
10501053
GUSISetupConsoleStdio
10511054
GUSIStdioFlush
10521055
GUSIStdioClose

‎Mac/Build/PythonCore.mcp‎

0 Bytes
Binary file not shown.

‎Mac/Build/PythonCoreCarbon.exp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,9 @@ PyObject_Compare
479479
PyObject_Unicode
480480
PyObject_Str
481481
PyObject_Repr
482+
_PyGC_Dump
482483
_PyObject_Dump
483484
PyObject_Print
484-
_PyGC_Remove
485-
_PyGC_Insert
486485
_PyObject_Del
487486
_PyObject_NewVar
488487
_PyObject_New
@@ -620,6 +619,7 @@ Py_GetPlatform
620619
PyMac_ConsoleIsDead
621620
PyMac_AppearanceCompliant
622621
PyMac_OSErrException
622+
PyMacGluePtr_PyMac_GetFSSpec
623623
PyMacGluePtr_AEDesc_New
624624
PyMacGluePtr_AEDesc_Convert
625625
PyMacGluePtr_CmpObj_New
@@ -712,6 +712,7 @@ CmpObj_Convert
712712
CmpObj_New
713713
AEDesc_Convert
714714
AEDesc_New
715+
PyMac_GetFSSpec
715716
PyMac_Buildwide
716717
PyMac_Getwide
717718
PyMac_BuildFixed
@@ -783,7 +784,7 @@ PyMac_BuildFSRef
783784
PyMac_GetFSRef
784785
newmfsrobject
785786
newmfssobject
786-
PyMac_GetFSSpec
787+
_PyMac_GetFSSpec
787788
initmac
788789
initMacOS
789790
Pcre_Type
@@ -1040,6 +1041,9 @@ PyDescr_NewWrapper
10401041
PyDescr_NewGetSet
10411042
PyDescr_NewMember
10421043
PyDescr_NewMethod
1044+
initgc
1045+
_PyGC_Remove
1046+
_PyGC_Insert
10431047
GUSISetupConsoleStdio
10441048
GUSIStdioFlush
10451049
GUSIStdioClose

‎Mac/Include/pyconfig.h‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
129129
/* Define if you have the Mach cthreads package */
130130
#undef C_THREADS
131131

132-
/* Defined when case of imported modules are checked against case of file. */
133-
#define CHECK_IMPORT_CASE
134-
135132
/* Define to `long' if <time.h> doesn't define. */
136133
#undef clock_t
137134

@@ -148,6 +145,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
148145
/* Define this if your time.h defines altzone */
149146
#undef HAVE_ALTZONE
150147

148+
/* Define if --enable-ipv6 is specified */
149+
#undef ENABLE_IPV6
150+
151+
/* Define if sockaddr has sa_len member */
152+
#undef HAVE_SOCKADDR_SA_LEN
153+
154+
/* struct addrinfo (netdb.h) */
155+
#undef HAVE_ADDRINFO
156+
157+
/* struct sockaddr_storage (sys/socket.h) */
158+
#undef HAVE_SOCKADDR_STORAGE
159+
151160
/* Defined when any dynamic module loading is enabled */
152161
/* #undef HAVE_DYNAMIC_LOADING */
153162

@@ -184,6 +193,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
184193
/* Define if you have GNU PTH threads */
185194
#undef HAVE_PTH
186195

196+
/* Define if you have readline 4.2 */
197+
#undef HAVE_RL_COMPLETION_MATCHES
198+
187199
/* Define if your compiler supports variable length function prototypes
188200
(e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
189201
#define HAVE_STDARG_PROTOTYPES
@@ -208,6 +220,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
208220
/* Define as the size of the unicode type. */
209221
#define Py_UNICODE_SIZE 2
210222

223+
/* Define if nice() returns success/failure instead of the new priority. */
224+
#undef HAVE_BROKEN_NICE
225+
211226
/* Define if malloc(0) returns a NULL pointer */
212227
#ifdef USE_MSL_MALLOC
213228
#define MALLOC_ZERO_RETURNS_NULL
@@ -269,7 +284,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
269284
#undef WANT_WCTYPE_FUNCTIONS
270285

271286
/* Define if you want to compile in cycle garbage collection */
272-
#undef WITH_CYCLE_GC
287+
#define WITH_CYCLE_GC 1
273288

274289
/* Define if you want to emulate SGI (IRIX 4) dynamic linking.
275290
This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
@@ -294,6 +309,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
294309
(shared library plus accessory files). */
295310
#undef WITH_NEXT_FRAMEWORK
296311

312+
/* Define if you want to use MacPython modules on MacOSX in unix-Python */
313+
#define USE_TOOLBOX_OBJECT_GLUE
314+
297315
/* Define if you want to use SGI (IRIX 4) dynamic linking.
298316
This requires the "dl" library by Jack Jansen,
299317
ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
@@ -419,6 +437,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
419437
/* Define if you have the getlogin function. */
420438
#undef HAVE_GETLOGIN
421439

440+
/* Define if you have the getnameinfo function. */
441+
#undef HAVE_GETNAMEINFO
442+
422443
/* Define if you have the getpeername function. */
423444
#ifdef USE_GUSI
424445
#define HAVE_GETPEERNAME
@@ -430,6 +451,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
430451
/* Define if you have the getpid function. */
431452
#undef HAVE_GETPID
432453

454+
/* Define if you have the getpriority function. */
455+
#undef HAVE_GETPRIORITY
456+
433457
/* Define if you have the getpwent function. */
434458
#undef HAVE_GETPWENT
435459

@@ -441,6 +465,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
441465
/* Define if you have the getwd function. */
442466
#undef HAVE_GETWD
443467

468+
/* Define if you have the hstrerror function. */
469+
#undef HAVE_HSTRERROR
470+
444471
/* Define if you have the hypot function. */
445472
#ifndef __MC68K__
446473
/* 68K hypot definition (and implementation) are unuseable
@@ -449,6 +476,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
449476
#define HAVE_HYPOT
450477
#endif
451478

479+
/* Define if you have the inet_pton function. */
480+
#undef HAVE_INET_PTON
481+
452482
/* Define if you have the kill function. */
453483
#undef HAVE_KILL
454484

@@ -544,6 +574,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
544574
/* Define if you have the sigrelse function. */
545575
#undef HAVE_SIGRELSE
546576

577+
/* Define if you have the snprintf function. */
578+
#define HAVE_SNPRINTF
579+
547580
/* Define if you have the statvfs function. */
548581
#undef HAVE_STATVFS
549582

@@ -683,6 +716,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
683716
/* Define if you have the <sys/param.h> header file. */
684717
#undef HAVE_SYS_PARAM_H
685718

719+
/* Define if you have the <sys/poll.h> header file. */
720+
#undef HAVE_SYS_POLL_H
721+
722+
/* Define if you have the <sys/resource.h> header file. */
723+
#undef HAVE_SYS_RESOURCE_H
724+
686725
/* Define if you have the <sys/select.h> header file. */
687726
#undef HAVE_SYS_SELECT_H
688727

‎Mac/Python/macgetcompiler.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,13 @@ PERFORMANCE OF THIS SOFTWARE.
5757
#define TARGET_API " PPC"
5858
#endif
5959

60-
#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD"]"
60+
#ifdef WITH_CYCLE_GC
61+
#define HASGC " GC"
62+
#else
63+
#define HASGC ""
64+
#endif
65+
66+
#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD HASGC"]"
6167
#endif
6268

6369
#ifdef MPW

0 commit comments

Comments
 (0)