Update of /cvsroot/ctypes/ctypes/ctypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4099
Modified Files:
_loader.py
Log Message:
Merge in changes made in Python SVN.
Index: _loader.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/ctypes/_loader.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _loader.py 5 Apr 2006 12:51:57 -0000 1.4
--- _loader.py 13 Apr 2006 18:11:46 -0000 1.5
***************
*** 1,13 ****
- # WORK IN PROGRESS! DO NOT (yet) USE!
import sys, os
import ctypes
- __all__ = ["LibraryLoader", "RTLD_LOCAL", "RTLD_GLOBAL"]
-
if os.name in ("nt", "ce"):
from _ctypes import LoadLibrary as dlopen
- RTLD_LOCAL = RTLD_GLOBAL = None
else:
! from _ctypes import dlopen, RTLD_LOCAL, RTLD_GLOBAL
# _findLib(name) returns an iterable of possible names for a library.
--- 1,10 ----
import sys, os
import ctypes
if os.name in ("nt", "ce"):
from _ctypes import LoadLibrary as dlopen
else:
! from _ctypes import dlopen
! from _ctypes import RTLD_LOCAL, RTLD_GLOBAL
# _findLib(name) returns an iterable of possible names for a library.
|
