]> granicus.if.org Git - python/commitdiff
Under MachO-Python unconditionally import macfsn.
authorJack Jansen <jack.jansen@cwi.nl>
Thu, 1 Nov 2001 14:00:19 +0000 (14:00 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Thu, 1 Nov 2001 14:00:19 +0000 (14:00 +0000)
Mac/Modules/macfsmodule.c

index f16cd363dc7626c6a1592ae8a3a585486e713670..61127aa89baf2ea3070c8930372e4e95a06ec500 100644 (file)
@@ -39,8 +39,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "getapplbycreator.h"
 
+#ifndef TARGET_API_MAC_OSX
 #include "pythonresources.h"
 extern PyMac_PrefRecord PyMac_options;
+#endif
 
 #ifdef USE_TOOLBOX_OBJECT_GLUE
 extern int _PyMac_GetFSSpec(PyObject *, FSSpec *);
@@ -1218,7 +1220,9 @@ PyObject *PyMac_BuildFSSpec(FSSpec *v)
 static void
 PyMac_InstallNavServicesForSF(void)
 {
+#ifndef TARGET_API_MAC_OSX
        if ( !PyMac_options.nonavservice ) {
+#endif
                PyObject *m = PyImport_ImportModule("macfsn");
                
                if ( m == NULL ) {
@@ -1232,7 +1236,9 @@ PyMac_InstallNavServicesForSF(void)
                        }
                        PyErr_Clear();
                }
+#ifndef TARGET_API_MAC_OSX
        }
+#endif
 }