Ticket #70: paul-2.7.5.diff

Python/thread_pthread.h

@@ -207 +207 @@
     if (status != 0)
         return -1;
 
+#ifndef __OS2__
     pthread_detach(th);
+#endif
 
 #if SIZEOF_PTHREAD_T <= SIZEOF_LONG
     return (long) th;

Python/thread.c

@@ -31 +31 @@
 
 #include "pythread.h"
 
+#ifdef __OS2__
+#define OS2_THREADS 1
+#undef _POSIX_THREADS
+#endif
+
 #ifndef _POSIX_THREADS
 
 #ifdef __sgi

Python/random.c

@@ -95 +95 @@
 #endif /* MS_WINDOWS */
 
 
-#ifdef __VMS
+#if defined(__VMS) || defined(__OS2__)
 /* Use openssl random routine */
 #include <openssl/rand.h>
 static int
@@ -116 +116 @@
 #endif /* __VMS */
 
 
-#if !defined(MS_WINDOWS) && !defined(__VMS)
+#if !defined(MS_WINDOWS) && !defined(__VMS) && !defined(__OS2__)
 
 /* Read size bytes from /dev/urandom into buffer.
    Call Py_FatalError() on error. */
@@ -243 +243 @@
 #ifdef MS_WINDOWS
     return win32_urandom((unsigned char *)buffer, size, 1);
 #else
-# ifdef __VMS
+#if defined(__VMS) || defined(__OS2__)
     return vms_urandom((unsigned char *)buffer, size, 1);
 # else
     return dev_urandom_python((char*)buffer, size);
@@ -302 +302 @@
 #ifdef MS_WINDOWS
         (void)win32_urandom((unsigned char *)secret, secret_size, 0);
 #else /* #ifdef MS_WINDOWS */
-# ifdef __VMS
+#if defined(__VMS) || defined(__OS2__)
         vms_urandom((unsigned char *)secret, secret_size, 0);
 # else
         dev_urandom_noraise((char*)secret, secret_size);

Lib/ctypes/__init__.py

@@ -137 +137 @@
     if WINFUNCTYPE.__doc__:
         WINFUNCTYPE.__doc__ = CFUNCTYPE.__doc__.replace("CFUNCTYPE", "WINFUNCTYPE")
 
-elif _os.name == "posix":
+elif _os.name in ("posix", "os2"):
     from _ctypes import dlopen as _dlopen
 
 from _ctypes import sizeof, byref, addressof, alignment, resize