Changeset 10 for python/trunk/Python/dynload_shlib.c

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/Python/dynload_shlib.c (modified) (3 diffs)

python/trunk/Python/dynload_shlib.c

@@ -21 +21 @@
 #else
 #if defined(PYOS_OS2) && defined(PYCC_GCC)
+#ifdef __KLIBC__
+#error "kLIBC has dlfcn.h and shouldn't get here!"
+#endif
 #include "dlfcn.h"
 #endif
 #endif
 
-#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
+#if ((defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)) \
+    || (defined(__OS2__) && defined(__KLIBC__))
 #define LEAD_UNDERSCORE "_"
 #else
@@ -37 +41 @@
         {"module.dll", "rb", C_EXTENSION},
 #else
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
+#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || (defined(__OS2__) && defined(__KLIBC__))
         {".pyd", "rb", C_EXTENSION},
         {".dll", "rb", C_EXTENSION},
@@ -128 +132 @@
 #endif
 
+#if (defined(PYOS_OS2) && defined(PYCC_GCC))
+        // resolve unixroot
+        if (_realrealpath( pathname, pathbuf, sizeof(pathbuf))!=0)
+                pathname = pathbuf;
+#endif
+
         handle = dlopen(pathname, dlopenflags);