Commit 01a94627 authored by Jack Jansen's avatar Jack Jansen

Under MachO-Python unconditionally import macfsn.

parent b73efee6
...@@ -39,8 +39,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -39,8 +39,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "getapplbycreator.h" #include "getapplbycreator.h"
#ifndef TARGET_API_MAC_OSX
#include "pythonresources.h" #include "pythonresources.h"
extern PyMac_PrefRecord PyMac_options; extern PyMac_PrefRecord PyMac_options;
#endif
#ifdef USE_TOOLBOX_OBJECT_GLUE #ifdef USE_TOOLBOX_OBJECT_GLUE
extern int _PyMac_GetFSSpec(PyObject *, FSSpec *); extern int _PyMac_GetFSSpec(PyObject *, FSSpec *);
...@@ -1218,7 +1220,9 @@ PyObject *PyMac_BuildFSSpec(FSSpec *v) ...@@ -1218,7 +1220,9 @@ PyObject *PyMac_BuildFSSpec(FSSpec *v)
static void static void
PyMac_InstallNavServicesForSF(void) PyMac_InstallNavServicesForSF(void)
{ {
#ifndef TARGET_API_MAC_OSX
if ( !PyMac_options.nonavservice ) { if ( !PyMac_options.nonavservice ) {
#endif
PyObject *m = PyImport_ImportModule("macfsn"); PyObject *m = PyImport_ImportModule("macfsn");
if ( m == NULL ) { if ( m == NULL ) {
...@@ -1232,7 +1236,9 @@ PyMac_InstallNavServicesForSF(void) ...@@ -1232,7 +1236,9 @@ PyMac_InstallNavServicesForSF(void)
} }
PyErr_Clear(); PyErr_Clear();
} }
#ifndef TARGET_API_MAC_OSX
} }
#endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment