1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revived the getenv macro for dln_find.c

Browse Source 
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.
This commit is contained in:
Nobuyoshi Nakada 2020-11-28 18:39:57 +09:00
parent 14453a256d
commit 3db21cf25f
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
win32/win32.c
View File

@ -71,9 +71,13 @@ static int w32_stati128(const char *path, struct stati128 *st, UINT cp, BOOL lst
static char *w32_getenv(const char *name, UINT cp); static char *w32_getenv(const char *name, UINT cp);
#undef getenv #undef getenv
/*
* Do not remove the macros to substitute functions in dln_find.c.
*/
#define DLN_FIND_EXTRA_ARG_DECL ,UINT cp #define DLN_FIND_EXTRA_ARG_DECL ,UINT cp
#define DLN_FIND_EXTRA_ARG ,cp #define DLN_FIND_EXTRA_ARG ,cp
#define rb_w32_stati128(path, st) w32_stati128(path, st, cp, FALSE) #define rb_w32_stati128(path, st) w32_stati128(path, st, cp, FALSE)
#define getenv(name) w32_getenv(name, cp)
#undef CharNext #undef CharNext
#define CharNext(p) CharNextExA(cp, (p), 0) #define CharNext(p) CharNextExA(cp, (p), 0)
#define dln_find_exe_r rb_w32_udln_find_exe_r #define dln_find_exe_r rb_w32_udln_find_exe_r