summaryrefslogtreecommitdiff
path: root/win32/config_H.gc
diff options
context:
space:
mode:
authorDaniel Dragan <bulk88@hotmail.com>2015-05-21 17:06:27 -0400
committerTony Cook <tony@develop-help.com>2015-06-03 12:07:09 +1000
commit1c68cbf70f1d1b9aaa6a927943d4f1c075ce8d1c (patch)
treeacdc2fbdf06ff9ec144cec709ab13b21bcc1a96a /win32/config_H.gc
parent269713a163ea7f178a8c2a31d3c0e5caf5cbf7ce (diff)
downloadperl-1c68cbf70f1d1b9aaa6a927943d4f1c075ce8d1c.tar.gz
refactor win32_get_*lib() funcs to match rest of PERL_IMPLICIT_SYS API
The front end of PERL_IMPLICIT_SYS is PerlEnv_*/PerlSock_*/PerlProc_*/etc macros. These are either macroed to C vtable calls when PERL_IMPLICIT_SYS is on, or to the backend raw win32_*() functions when PERL_IMPLICIT_SYS is off. win32_get_*() were not following this convention. All this code looks like a hack as if someone didn't have perms to edit perl.c, but they did have perms to edit /win32, so they devise a scheme of hooking "unhooked" win32_get_*() functions with win32.h macros for win32_get_*() to call the Perl*() virutalization macros, and rename the original function bodies in win32.c to g_win32_get_*() as to not make a macro loop. Undo all of this hack by having perl.c call correct PerlEnv_* macro. This refactoring will be useful for a future patch in #123658 to disable win32 registry lookups.
Diffstat (limited to 'win32/config_H.gc')
-rw-r--r--win32/config_H.gc4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 40ce6c7157..a51bee65e2 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -3064,7 +3064,7 @@
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
#define PRIVLIB "c:\\perl\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib(PERL_VERSION_STRING, NULL)) /**/
+#define PRIVLIB_EXP (PerlEnv_lib_path(PERL_VERSION_STRING, NULL)) /**/
/* CAN_PROTOTYPE:
* If defined, this macro indicates that the C compiler can handle
@@ -3231,7 +3231,7 @@
* be tacked onto this variable to generate a list of directories to search.
*/
#define SITELIB "c:\\perl\\site\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib(PERL_VERSION_STRING, NULL)) /**/
+#define SITELIB_EXP (PerlEnv_sitelib_path(PERL_VERSION_STRING, NULL)) /**/
#define SITELIB_STEM "" /**/
/* Size_t_size: