From 4f97475d326c2773a78561fb874e4f23c25cbcd9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 17 Feb 2019 17:44:42 +0100 Subject: 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) --- src/if_ruby.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/if_ruby.c') diff --git a/src/if_ruby.c b/src/if_ruby.c index 24814a2326..85f94c4f09 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -64,7 +64,7 @@ # define RUBY_EXPORT # endif -#if !(defined(WIN32) || defined(_WIN64)) +#if !defined(MSWIN) # include # 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"}; -- cgit v1.2.3