From 59c14e225498456d93924cc6b94c3366a2f65101 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Tue, 7 Aug 2001 12:33:32 +0000 Subject: [PATCH] Bit the bullet and enabled garbage collection (finally). Also updated pyconfig.h to the current state of pyconfig.h.in. --- Mac/Build/PythonCore.exp | 11 +++++--- Mac/Build/PythonCore.mcp | Bin 158538 -> 158538 bytes Mac/Build/PythonCoreCarbon.exp | 10 ++++--- Mac/Include/pyconfig.h | 47 ++++++++++++++++++++++++++++++--- Mac/Python/macgetcompiler.c | 8 +++++- 5 files changed, 64 insertions(+), 12 deletions(-) diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp index 142078b595..cf77ed16a7 100644 --- a/Mac/Build/PythonCore.exp +++ b/Mac/Build/PythonCore.exp @@ -479,10 +479,9 @@ PyObject_Compare PyObject_Unicode PyObject_Str PyObject_Repr +_PyGC_Dump _PyObject_Dump PyObject_Print -_PyGC_Remove -_PyGC_Insert _PyObject_Del _PyObject_NewVar _PyObject_New @@ -620,6 +619,7 @@ Py_GetPlatform PyMac_ConsoleIsDead PyMac_AppearanceCompliant PyMac_OSErrException +PyMacGluePtr_PyMac_GetFSSpec PyMacGluePtr_AEDesc_New PyMacGluePtr_AEDesc_Convert PyMacGluePtr_CmpObj_New @@ -712,6 +712,7 @@ CmpObj_Convert CmpObj_New AEDesc_Convert AEDesc_New +PyMac_GetFSSpec PyMac_Buildwide PyMac_Getwide PyMac_BuildFixed @@ -788,9 +789,8 @@ initmacfs PyMac_BuildFSSpec PyMac_BuildFSRef PyMac_GetFSRef -newmfsrobject newmfssobject -PyMac_GetFSSpec +_PyMac_GetFSSpec initmac initMacOS Pcre_Type @@ -1047,6 +1047,9 @@ PyDescr_NewWrapper PyDescr_NewGetSet PyDescr_NewMember PyDescr_NewMethod +initgc +_PyGC_Remove +_PyGC_Insert GUSISetupConsoleStdio GUSIStdioFlush GUSIStdioClose diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp index 80d92cdb4e17c68dd954cd2a542619e19fc1c66b..c662d6267fc981a4f4d7c0ba4f72b79442264b99 100644 GIT binary patch delta 2277 zcmeIz?Qcw390%}oPVdb0Qq@uq?M!v1R98_|>-nJ_53SPH=&EdOr&&rzsxs&xycu2D z&=`_&)O|tN?QRIFk=$@AsfT#!IcZmsiCx(j#EP|vR6>H^z4LA250H4Xlid3`_dDk? z_uQPD57e6v)C)dm=5LI#bDVB;JtVAWg$i`_%FWINLn8EWMx`5FPjvV0L@uwpZaCTw zzhbPiUvJI)Q4xH&{>)RCFrKGTM{dTF-!Ya#P3W1kDOAvfIR^bWD`0vsr!HL$)Nc;1 z-`=z#U;9t+`BC3({m-I*-1g*u&1O;W5qczY%=9F2#(bno= zEO=G-biL=AuJe(OwutuedLXo4*xIRWd(`VPHg@p+LZQ|6=qWoV z3R}!t=F9qk;O){CT5i1UipaJ$g6x>R8le#d9j*sV#AktZ4^aaG=G$WR}al$9?r$CR%coM9>` z2yD;}Pr!8OfM;PM?13sA1P8+;I0Pocq2xMqCMgKoU@9C2hr>rO4UT{#;e9v?p0<=P z0$JuVGm!3sccBxyU?zMF$G|M;h8~y=$HG70IG96*&1H^9kPE+o6JQ>k2q(eG@Fe`D zw5r-?ZbR$vvb!-am3sXiX-zzR+c?%k z=?_S2p&!=8Yt7x1>!n&9NW*Xsya6x37Wfm~YblF@9&@a2q*vfocr9M5C77*Ht$T8C zQ!ZEad%>q%zTPq?>|@qT{#v^%9K$rf(k@%Ux-fzNcUk;v`?9<2Z!QbBI(fvXz07NV zR(fy}rpwBfMDsN5)jF$%Q&zON=peLlBcoWz5lZay12c&~F{sjc#n`(>+~qu?Rn>}L z6IlIgt-n@GcJPjkj5)4rd47>6w*IcI_KP~vI8VFer$1TKbH+r(c;OeRY61)Sv=0p; P-yRH6T3{3g#AxLc@fG~l delta 1835 zcmd_r*-sNe90&0E4TVxg5e3xNN?TMA!2|D$L%F;QiV>xFg2s5o){B>-K8X54v+5Y} z!Uv6731*c=qi6^Zicw>t^?^iVJmM{hi7_#;&ThZPKf)%npPBE>?(A&a*{+bKD`aVL z+wA8UW0y%DWC=-(wnB|)G(cX+!C2pKjP;YJ$Tks6l$CU@Pa-SClGLrks|JhjoTdld&()W?pB#bW z6Y9Fv2Y9r83#Zk*jb2i0-X3aF;(V!r0#~$tvR!NmQYMjT43gCnDw;FDP`@S79weJz z4lwD7G#bXh({L~}!%Hw0K7C{i7*K!!v}C6 zykID9UZE6yomRvL;C*O=L!cc#gF|5obU-I`!BqGd4uiv`etn%I5TwC$I1*;SQ7{u` z!87n|aap-r|53<~DaO5eySI9~tp5EzMq}6*I9BS?=O2e48;*w)48^=_WcB}D)Fkvx zhEw2FxC8El)8KSC1I~mwFc;>*d^jtjpLr4Z;A~g`3tfc{m?7!h7(f zVJu_KMnyPV$WYJ*TEXzC%siHHt@f%Qu3i=Itqe zN+GR%0aa7Lovsxxrx>oLv{|^8y_hCdsP8w`bJgwZ&FPSG%PTkU-OBg1R&&GRui@~A zST)e{iV z$CV`N7BaAjMV%C<^{k|3leT|3e?(L-$|`wN6kR doesn't define. */ #undef clock_t @@ -148,6 +145,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define this if your time.h defines altzone */ #undef HAVE_ALTZONE +/* Define if --enable-ipv6 is specified */ +#undef ENABLE_IPV6 + +/* Define if sockaddr has sa_len member */ +#undef HAVE_SOCKADDR_SA_LEN + +/* struct addrinfo (netdb.h) */ +#undef HAVE_ADDRINFO + +/* struct sockaddr_storage (sys/socket.h) */ +#undef HAVE_SOCKADDR_STORAGE + /* Defined when any dynamic module loading is enabled */ /* #undef HAVE_DYNAMIC_LOADING */ @@ -184,6 +193,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define if you have GNU PTH threads */ #undef HAVE_PTH +/* Define if you have readline 4.2 */ +#undef HAVE_RL_COMPLETION_MATCHES + /* Define if your compiler supports variable length function prototypes (e.g. void fprintf(FILE *, char *, ...);) *and* */ #define HAVE_STDARG_PROTOTYPES @@ -208,6 +220,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define as the size of the unicode type. */ #define Py_UNICODE_SIZE 2 +/* Define if nice() returns success/failure instead of the new priority. */ +#undef HAVE_BROKEN_NICE + /* Define if malloc(0) returns a NULL pointer */ #ifdef USE_MSL_MALLOC #define MALLOC_ZERO_RETURNS_NULL @@ -269,7 +284,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #undef WANT_WCTYPE_FUNCTIONS /* Define if you want to compile in cycle garbage collection */ -#undef WITH_CYCLE_GC +#define WITH_CYCLE_GC 1 /* Define if you want to emulate SGI (IRIX 4) dynamic linking. 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. (shared library plus accessory files). */ #undef WITH_NEXT_FRAMEWORK +/* Define if you want to use MacPython modules on MacOSX in unix-Python */ +#define USE_TOOLBOX_OBJECT_GLUE + /* Define if you want to use SGI (IRIX 4) dynamic linking. This requires the "dl" library by Jack Jansen, 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. /* Define if you have the getlogin function. */ #undef HAVE_GETLOGIN +/* Define if you have the getnameinfo function. */ +#undef HAVE_GETNAMEINFO + /* Define if you have the getpeername function. */ #ifdef USE_GUSI #define HAVE_GETPEERNAME @@ -430,6 +451,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define if you have the getpid function. */ #undef HAVE_GETPID +/* Define if you have the getpriority function. */ +#undef HAVE_GETPRIORITY + /* Define if you have the getpwent function. */ #undef HAVE_GETPWENT @@ -441,6 +465,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define if you have the getwd function. */ #undef HAVE_GETWD +/* Define if you have the hstrerror function. */ +#undef HAVE_HSTRERROR + /* Define if you have the hypot function. */ #ifndef __MC68K__ /* 68K hypot definition (and implementation) are unuseable @@ -449,6 +476,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define HAVE_HYPOT #endif +/* Define if you have the inet_pton function. */ +#undef HAVE_INET_PTON + /* Define if you have the kill function. */ #undef HAVE_KILL @@ -544,6 +574,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define if you have the sigrelse function. */ #undef HAVE_SIGRELSE +/* Define if you have the snprintf function. */ +#define HAVE_SNPRINTF + /* Define if you have the statvfs function. */ #undef HAVE_STATVFS @@ -683,6 +716,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Define if you have the header file. */ #undef HAVE_SYS_PARAM_H +/* Define if you have the header file. */ +#undef HAVE_SYS_POLL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + /* Define if you have the header file. */ #undef HAVE_SYS_SELECT_H diff --git a/Mac/Python/macgetcompiler.c b/Mac/Python/macgetcompiler.c index e3d24b7627..eb9c3c45fb 100644 --- a/Mac/Python/macgetcompiler.c +++ b/Mac/Python/macgetcompiler.c @@ -57,7 +57,13 @@ PERFORMANCE OF THIS SOFTWARE. #define TARGET_API " PPC" #endif -#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD"]" +#ifdef WITH_CYCLE_GC +#define HASGC " GC" +#else +#define HASGC "" +#endif + +#define COMPILER " [CW" TARGET_API HASGUSI HASTHREAD HASGC"]" #endif #ifdef MPW -- 2.40.0