Mercurial > vim

comparison src/if_ruby.c @ 15868:7fad90423bd2 v8.1.0941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 81db86aac412
children 8fb7dd311ca7
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
62 * "extern" and be able to avoid this problem. 62 * "extern" and be able to avoid this problem.
63 */ 63 */
64 # define RUBY_EXPORT 64 # define RUBY_EXPORT
65 # endif 65 # endif
66 66
67 #if !(defined(WIN32) || defined(_WIN64)) 67 #if !defined(MSWIN)
68 # include <dlfcn.h> 68 # include <dlfcn.h>
69 # define HINSTANCE void* 69 # define HINSTANCE void*
70 # define RUBY_PROC void* 70 # define RUBY_PROC void*
71 # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL) 71 # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
72 # define symbol_from_dll dlsym 72 # define symbol_from_dll dlsym
329 # else 329 # else
330 # define ruby_errinfo (*dll_ruby_errinfo) 330 # define ruby_errinfo (*dll_ruby_errinfo)
331 # endif 331 # endif
332 # define ruby_init dll_ruby_init 332 # define ruby_init dll_ruby_init
333 # define ruby_init_loadpath dll_ruby_init_loadpath 333 # define ruby_init_loadpath dll_ruby_init_loadpath
334 # ifdef WIN3264 334 # ifdef MSWIN
335 # ifdef RUBY19_OR_LATER 335 # ifdef RUBY19_OR_LATER
336 # define ruby_sysinit dll_ruby_sysinit 336 # define ruby_sysinit dll_ruby_sysinit
337 # else 337 # else
338 # define NtInitialize dll_NtInitialize 338 # define NtInitialize dll_NtInitialize
339 # endif 339 # endif
445 # else 445 # else
446 static VALUE *dll_ruby_errinfo; 446 static VALUE *dll_ruby_errinfo;
447 # endif 447 # endif
448 static void (*dll_ruby_init) (void); 448 static void (*dll_ruby_init) (void);
449 static void (*dll_ruby_init_loadpath) (void); 449 static void (*dll_ruby_init_loadpath) (void);
450 # ifdef WIN3264 450 # ifdef MSWIN
451 # ifdef RUBY19_OR_LATER 451 # ifdef RUBY19_OR_LATER
452 static void (*dll_ruby_sysinit) (int*, char***); 452 static void (*dll_ruby_sysinit) (int*, char***);
453 # else 453 # else
454 static void (*dll_NtInitialize) (int*, char***); 454 static void (*dll_NtInitialize) (int*, char***);
455 # endif 455 # endif
664 # else 664 # else
665 {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo}, 665 {"ruby_errinfo", (RUBY_PROC*)&dll_ruby_errinfo},
666 # endif 666 # endif
667 {"ruby_init", (RUBY_PROC*)&dll_ruby_init}, 667 {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
668 {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath}, 668 {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
669 # ifdef WIN3264 669 # ifdef MSWIN
670 # ifdef RUBY19_OR_LATER 670 # ifdef RUBY19_OR_LATER
671 {"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit}, 671 {"ruby_sysinit", (RUBY_PROC*)&dll_ruby_sysinit},
672 # else 672 # else
673 {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize}, 673 {"NtInitialize", (RUBY_PROC*)&dll_NtInitialize},
674 # endif 674 # endif
947 { 947 {
948 #ifdef DYNAMIC_RUBY 948 #ifdef DYNAMIC_RUBY
949 if (ruby_enabled(TRUE)) 949 if (ruby_enabled(TRUE))
950 { 950 {
951 #endif 951 #endif
952 #ifdef _WIN32 952 #ifdef MSWIN
953 /* suggested by Ariya Mizutani */ 953 /* suggested by Ariya Mizutani */
954 int argc = 1; 954 int argc = 1;
955 char *argv[] = {"gvim.exe"}; 955 char *argv[] = {"gvim.exe"};
956 char **argvp = argv; 956 char **argvp = argv;
957 # ifdef RUBY19_OR_LATER 957 # ifdef RUBY19_OR_LATER