ruby-changes:64349
From: Nobuyoshi <ko1@a...>
Date: Sun, 20 Dec 2020 01:58:34 +0900 (JST)
Subject: [ruby-changes:64349] d44671c819 (master): Revived the getenv macro for dln_find.c
https://git.ruby-lang.org/ruby.git/commit/?id=d44671c819 From d44671c819e104d329e604fdf9bb59bbb426afb5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 28 Nov 2020 18:39:57 +0900 Subject: Revived the getenv macro for dln_find.c This partially reverts commit "Windows: Improve readablity of getenv() encoding" 14453a256d58b11b06d432e2a4388d95aac298d6. The `getenv` macro defined here is to also substitute the function in dln_find.c, not only in this file. diff --git a/win32/win32.c b/win32/win32.c index ac83195..5904082 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -77,6 +77,7 @@ static char *w32_getenv(const char *name, UINT cp); https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L77 #define DLN_FIND_EXTRA_ARG_DECL ,UINT cp #define DLN_FIND_EXTRA_ARG ,cp #define rb_w32_stati128(path, st) w32_stati128(path, st, cp, FALSE) +#define getenv(name) w32_getenv(name, cp) /* Necessarily For dln.c */ #undef CharNext #define CharNext(p) CharNextExA(cp, (p), 0) #define dln_find_exe_r rb_w32_udln_find_exe_r -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/