RT #127212: retain binary compatibility across plain/DEBUGGING

[perl5.git] / iperlsys.h

diff --git a/iperlsys.h b/iperlsys.h
index 57160e0..86ab687 100644 (file)
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -478,7 +478,7 @@ typedef char*               (*LPENVGetenv_len)(struct IPerlEnv*,
 #endif
 #ifdef WIN32
 typedef unsigned long  (*LPEnvOsID)(struct IPerlEnv*);
-typedef char*          (*LPEnvLibPath)(struct IPerlEnv*, const char*,
+typedef char*          (*LPEnvLibPath)(struct IPerlEnv*, WIN32_NO_REGISTRY_M_(const char*)
                                        STRLEN *const len);
 typedef char*          (*LPEnvSiteLibPath)(struct IPerlEnv*, const char*,
                                            STRLEN *const len);
@@ -550,7 +550,7 @@ struct IPerlEnvInfo
 #define PerlEnv_os_id()                                                \
        (*PL_Env->pEnvOsID)(PL_Env)
 #define PerlEnv_lib_path(str, lenp)                            \
-       (*PL_Env->pLibPath)(PL_Env,(str),(lenp))
+       (*PL_Env->pLibPath)(PL_Env,WIN32_NO_REGISTRY_M_(str)(lenp))
 #define PerlEnv_sitelib_path(str, lenp)                                \
        (*PL_Env->pSiteLibPath)(PL_Env,(str),(lenp))
 #define PerlEnv_vendorlib_path(str, lenp)                      \
@@ -575,7 +575,7 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()                        win32_os_id()
-#define PerlEnv_lib_path(str, lenp)    win32_get_privlib(str, lenp)
+#define PerlEnv_lib_path(str, lenp)    win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp)
 #define PerlEnv_sitelib_path(str, lenp)        win32_get_sitelib(str, lenp)
 #define PerlEnv_vendorlib_path(str, lenp)      win32_get_vendorlib(str, lenp)
 #define PerlEnv_get_child_IO(ptr)      win32_get_child_IO(ptr)
@@ -600,6 +600,8 @@ struct IPerlEnvInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
+struct utimbuf; /* prevent gcc warning about the use below */
+
 /* IPerlLIO            */
 struct IPerlLIO;
 struct IPerlLIOInfo;