Mercurial > vim
comparison src/if_python.c @ 7528:53163e4d9e4f v7.4.1065
commit https://github.com/vim/vim/commit/25e4fcde767084d1a79e0926bc301c92987c0cce
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 9 14:57:47 2016 +0100
patch 7.4.1065
Problem: Cannot use the "dll" options on MS-Windows.
Solution: Support the options on all platforms. Use the built-in name as
the default, so that it's clear what Vim is looking for.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 09 Jan 2016 15:00:05 +0100 |
| parents | cd69647bb839 |
| children | bcef391c101c |
comparison
equal
deleted
inserted
replaced
| 7527:3c5d446fb80b | 7528:53163e4d9e4f |
|---|---|
| 730 * TRUE, else FALSE. | 730 * TRUE, else FALSE. |
| 731 */ | 731 */ |
| 732 int | 732 int |
| 733 python_enabled(int verbose) | 733 python_enabled(int verbose) |
| 734 { | 734 { |
| 735 #ifdef WIN3264 | 735 return python_runtime_link_init((char *)p_pydll, verbose) == OK; |
| 736 char *dll = DYNAMIC_PYTHON_DLL; | |
| 737 #else | |
| 738 char *dll = *p_pydll ? (char *)p_pydll : DYNAMIC_PYTHON_DLL; | |
| 739 #endif | |
| 740 return python_runtime_link_init(dll, verbose) == OK; | |
| 741 } | 736 } |
| 742 | 737 |
| 743 /* | 738 /* |
| 744 * Load the standard Python exceptions - don't import the symbols from the | 739 * Load the standard Python exceptions - don't import the symbols from the |
| 745 * DLL, as this can cause errors (importing data symbols is not reliable). | 740 * DLL, as this can cause errors (importing data symbols is not reliable). |