aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.0941: macros for MS-Windows are inconsistent

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2019-02-17 17:44:42 +01:00
parent 78d21dae9c
commit 4f97475d32
68 changed files with 537 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/if_ruby.c
View File

@@ -64,7 +64,7 @@
# define RUBY_EXPORT
# endif
#if !(defined(WIN32) || defined(_WIN64))
#if !defined(MSWIN)
# include <dlfcn.h>
# define HINSTANCE void*
# define RUBY_PROC void*
@@ -331,7 +331,7 @@ static void ruby_vim_init(void);
# endif
# define ruby_init dll_ruby_init
# define ruby_init_loadpath dll_ruby_init_loadpath
# ifdef WIN3264
# ifdef MSWIN
# ifdef RUBY19_OR_LATER
# define ruby_sysinit dll_ruby_sysinit
# else
@@ -447,7 +447,7 @@ static VALUE *dll_ruby_errinfo;
# endif
static void (*dll_ruby_init) (void);
static void (*dll_ruby_init_loadpath) (void);
# ifdef WIN3264
# ifdef MSWIN
# ifdef RUBY19_OR_LATER
static void (*dll_ruby_sysinit) (int*, char***);
# else
@@ -666,7 +666,7 @@ static struct
# endif
{"ruby_init", (RUBY_PROC*)&dll_ruby_init},
{"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
# ifdef WIN3264
# ifdef MSWIN
# ifdef RUBY19_OR_LATER
{"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
# else
@@ -949,7 +949,7 @@ static int ensure_ruby_initialized(void)
if (ruby_enabled(TRUE))
{
#endif
#ifdef _WIN32
#ifdef MSWIN
/* suggested by Ariya Mizutani */
int argc = 1;
char *argv[] = {"gvim.exe"};