Author: Armin Rigo <[email protected]>
Branch:
Changeset: r45132:856fae013849
Date: 2011-06-26 12:12 +0200
http://bitbucket.org/pypy/pypy/changeset/856fae013849/
Log: 64-bit fix.
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -900,7 +900,7 @@
def _ssl_thread_id_function():
from pypy.module.thread import ll_thread
- return rffi.cast(rffi.INT, ll_thread.get_ident())
+ return rffi.cast(rffi.LONG, ll_thread.get_ident())
def setup_ssl_threads():
from pypy.module.thread import ll_thread
diff --git a/pypy/rlib/ropenssl.py b/pypy/rlib/ropenssl.py
--- a/pypy/rlib/ropenssl.py
+++ b/pypy/rlib/ropenssl.py
@@ -151,7 +151,7 @@
[rffi.INT, rffi.INT, rffi.CCHARP, rffi.INT], lltype.Void))],
lltype.Void)
ssl_external('CRYPTO_set_id_callback',
- [lltype.Ptr(lltype.FuncType([], rffi.INT))],
+ [lltype.Ptr(lltype.FuncType([], rffi.LONG))],
lltype.Void)
if HAVE_OPENSSL_RAND:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
