Mercurial > vim
comparison src/if_python3.c @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 17 Feb 2019 17:45:08 +0100 |
parents | 55ccc2d353bd |
children | a83c4b1f8ea2 |
comparison
equal
deleted
inserted
replaced
15867:4a3823e692d3 | 15868:7fad90423bd2 |
---|---|
32 | 32 |
33 #include "vim.h" | 33 #include "vim.h" |
34 | 34 |
35 #include <limits.h> | 35 #include <limits.h> |
36 | 36 |
37 #if defined(_WIN32) && defined(HAVE_FCNTL_H) | 37 #if defined(MSWIN) && defined(HAVE_FCNTL_H) |
38 # undef HAVE_FCNTL_H | 38 # undef HAVE_FCNTL_H |
39 #endif | 39 #endif |
40 | 40 |
41 #ifdef _DEBUG | 41 #ifdef _DEBUG |
42 # undef _DEBUG | 42 # undef _DEBUG |
110 typedef PySliceObject PySliceObject_T; | 110 typedef PySliceObject PySliceObject_T; |
111 #endif | 111 #endif |
112 | 112 |
113 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) | 113 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
114 | 114 |
115 # ifndef WIN3264 | 115 # ifndef MSWIN |
116 # include <dlfcn.h> | 116 # include <dlfcn.h> |
117 # define FARPROC void* | 117 # define FARPROC void* |
118 # define HINSTANCE void* | 118 # define HINSTANCE void* |
119 # if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL) | 119 # if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL) |
120 # define load_dll(n) dlopen((n), RTLD_LAZY) | 120 # define load_dll(n) dlopen((n), RTLD_LAZY) |