[Commit-gnuradio] r8099 - gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2008-03-24 10:07:38 -0600 (Mon, 24 Mar 2008)
New Revision: 8099

Modified:
   
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
Log:
Applied changeset r8096 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py 
    2008-03-24 16:05:05 UTC (rev 8098)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py 
    2008-03-24 16:07:38 UTC (rev 8099)
@@ -36,8 +36,9 @@
     except ImportError:
        pass
     
-_dlopenflags = sys.getdlopenflags()
-sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
+if _RTLD_GLOBAL != 0:
+    _dlopenflags = sys.getdlopenflags()
+    sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
 
 from gnuradio_swig_python import *
 from basic_flow_graph import *
@@ -47,7 +48,8 @@
 from hier_block2 import *
 from top_block import *
 
-sys.setdlopenflags(_dlopenflags)             # Restore original flags
+if _RTLD_GLOBAL != 0:
+    sys.setdlopenflags(_dlopenflags)             # Restore original flags
 
 # create a couple of aliases
 serial_to_parallel = stream_to_vector