[Zope] - Zope-1.9.0 + Python-1.5.2b1 = BOOM

[Andy Dustman]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---187888452-2009856136-914536377=:23785
Content-Type: TEXT/PLAIN; charset=US-ASCII

When compiling, I get:

./../Components/ExtensionClass/ThreadLock.c:75: parse error before `type_lock'

Apparently this is due to a renaming in Python between 1.5.1 and 1.5.2b1:
thread.h -> pythread.h (which the code does look for) but apparently there
has now been a renaming of type_lock -> PyThread_type_lock (also
type_sema -> PyThread_type_sema) and free_lock -> PyThread_free_lock. I'm
guessing the first change came with the 1.5.2a series and the latter came
with 1.5.2b; 1.5.2b1's pythread.h definitely does not have all the
renaming stuff in 1.5.1. Luckily I still had a 1.5.1 source tree lying
around. Making the changes above SHOULD work for 1.5.1 as well, however,
since it does do a bunch of renaming in thread.h, but if you're using
1.5.1, you probably don't need the patch.

Patch attached.

-- 
Andy Dustman                    You should always say "spam" and "eggs"
ComStar Communications Corp.                 instead of "foo" and "bar"
(706) 549-7689 | PGP KeyID=0xC72F3F1D   in Python examples. (Mark Lutz)


---187888452-2009856136-914536377=:23785
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="threadlock.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.3.96.981224165257.23785E@kenny.comstar.net>
Content-Description: 

LS0tIFpvcGUtMS45LjAtc3JjL2xpYi9Db21wb25lbnRzL0V4dGVuc2lvbkNs
YXNzL1RocmVhZExvY2suYy5vcmlnCVR1ZSBOb3YgMTcgMTY6NDM6NTAgMTk5
OA0KKysrIFpvcGUtMS45LjAtc3JjL2xpYi9Db21wb25lbnRzL0V4dGVuc2lv
bkNsYXNzL1RocmVhZExvY2suYwlUaHUgRGVjIDI0IDE2OjQxOjIzIDE5OTgN
CkBAIC03Miw3ICs3Miw3IEBADQogICBpbnQgY291bnQ7DQogICBsb25nIGlk
Ow0KICNpZmRlZiBXSVRIX1RIUkVBRA0KLSAgdHlwZV9sb2NrIGxvY2s7DQor
ICBQeVRocmVhZF90eXBlX2xvY2sgbG9jazsNCiAjZW5kaWYNCiB9IFRocmVh
ZExvY2tPYmplY3Q7DQogDQpAQCAtODIsNyArODIsNyBAQA0KIGNhY3F1aXJl
KFRocmVhZExvY2tPYmplY3QgKnNlbGYpDQogew0KICNpZmRlZiBXSVRIX1RI
UkVBRA0KLSAgbG9uZyBpZCA9IGdldF90aHJlYWRfaWRlbnQoKTsNCisgIGxv
bmcgaWQgPSBQeVRocmVhZF9nZXRfdGhyZWFkX2lkZW50KCk7DQogI2Vsc2UN
CiAgIGxvbmcgaWQgPSAxOw0KICNlbmRpZg0KQEAgLTk5LDcgKzk5LDcgQEAN
CiAgICAgew0KICNpZmRlZiBXSVRIX1RIUkVBRA0KICAgICAgIFB5X0JFR0lO
X0FMTE9XX1RIUkVBRFMNCi0gICAgICBhY3F1aXJlX2xvY2soc2VsZi0+bG9j
aywgMSk7DQorICAgICAgUHlUaHJlYWRfYWNxdWlyZV9sb2NrKHNlbGYtPmxv
Y2ssIDEpOw0KICAgICAgIFB5X0VORF9BTExPV19USFJFQURTDQogI2VuZGlm
DQogICAgICAgc2VsZi0+Y291bnQ9MDsNCkBAIC0xMjAsNyArMTIwLDcgQEAN
CiBjcmVsZWFzZShUaHJlYWRMb2NrT2JqZWN0ICpzZWxmKQ0KIHsNCiAjaWZk
ZWYgV0lUSF9USFJFQUQNCi0gIGxvbmcgaWQgPSBnZXRfdGhyZWFkX2lkZW50
KCk7DQorICBsb25nIGlkID0gUHlUaHJlYWRfZ2V0X3RocmVhZF9pZGVudCgp
Ow0KICNlbHNlDQogICBsb25nIGlkID0gMTsNCiAjZW5kaWYNCkBAIC0xMzMs
NyArMTMzLDcgQEANCiAJIG9uZS4gKi8NCiAgICAgICBzZWxmLT5jb3VudC0t
Ow0KICNpZmRlZiBXSVRIX1RIUkVBRA0KLSAgICAgIGlmKHNlbGYtPmNvdW50
IDwgMCkgcmVsZWFzZV9sb2NrKHNlbGYtPmxvY2spOw0KKyAgICAgIGlmKHNl
bGYtPmNvdW50IDwgMCkgUHlUaHJlYWRfcmVsZWFzZV9sb2NrKHNlbGYtPmxv
Y2spOw0KICNlbmRpZg0KICAgICB9DQogICBlbHNlDQpAQCAtMTg3LDcgKzE4
Nyw3IEBADQogVGhyZWFkTG9ja19kZWFsbG9jKFRocmVhZExvY2tPYmplY3Qg
KnNlbGYpDQogew0KICNpZmRlZiBXSVRIX1RIUkVBRA0KLSAgZnJlZV9sb2Nr
KHNlbGYtPmxvY2spOw0KKyAgUHlUaHJlYWRfZnJlZV9sb2NrKHNlbGYtPmxv
Y2spOw0KICNlbmRpZg0KICAgUHlNZW1fREVMKHNlbGYpOw0KIH0NCkBAIC0y
NDgsNyArMjQ4LDcgQEANCiAgIFVOTEVTUyhzZWxmID0gUHlPYmplY3RfTkVX
KFRocmVhZExvY2tPYmplY3QsICZUaHJlYWRMb2NrVHlwZSkpIHJldHVybiBO
VUxMOw0KICAgc2VsZi0+Y291bnQ9LTE7DQogI2lmZGVmIFdJVEhfVEhSRUFE
DQotICBzZWxmLT5sb2NrID0gYWxsb2NhdGVfbG9jaygpOw0KKyAgc2VsZi0+
bG9jayA9IFB5VGhyZWFkX2FsbG9jYXRlX2xvY2soKTsNCiAgIGlmIChzZWxm
LT5sb2NrID09IE5VTEwpIHsNCiAgICAgUHlNZW1fREVMKHNlbGYpOw0KICAg
ICBzZWxmID0gTlVMTDsNCkBAIC0yNjIsNyArMjYyLDcgQEANCiBpZGVudChQ
eU9iamVjdCAqc2VsZiwgUHlPYmplY3QgKmFyZ3MpDQogew0KICNpZmRlZiBX
SVRIX1RIUkVBRA0KLSAgcmV0dXJuIFB5SW50X0Zyb21Mb25nKGdldF90aHJl
YWRfaWRlbnQoKSk7DQorICByZXR1cm4gUHlJbnRfRnJvbUxvbmcoUHlUaHJl
YWRfZ2V0X3RocmVhZF9pZGVudCgpKTsNCiAjZWxzZQ0KICAgcmV0dXJuIFB5
SW50X0Zyb21Mb25nKDApOw0KICNlbmRpZg0K
---187888452-2009856136-914536377=:23785--