Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYN...

diff --git a/Python/import.c b/Python/import.c
index 678a30b62039d372cd27b78a9e993b9cb8c8aa4a..e5f7cc61fcf8f4e781caf4ae007604ab74be3db6 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -119,15 +119,19 @@ _PyImport_Init(void)
        /* prepare _PyImport_Filetab: copy entries from
           _PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
         */
+#ifdef HAVE_DYNAMIC_LOADING
        for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan)
                ++countD;
+#endif
        for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan)
                ++countS;
        filetab = PyMem_NEW(struct filedescr, countD + countS + 1);
        if (filetab == NULL)
                Py_FatalError("Can't initialize import file table.");
+#ifdef HAVE_DYNAMIC_LOADING
        memcpy(filetab, _PyImport_DynLoadFiletab,
               countD * sizeof(struct filedescr));
+#endif
        memcpy(filetab + countD, _PyImport_StandardFiletab,
               countS * sizeof(struct filedescr));
        filetab[countD + countS].suffix = NULL;
@@ -1364,7 +1368,7 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
                saved_namelen = namelen;
 #endif /* PYOS_OS2 */
                for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
-#if defined(PYOS_OS2)
+#if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
                        /* OS/2 limits DLLs to 8 character names (w/o
                           extension)
                         * so if the name is longer than that and its a