change#5364 had a few problems

p4raw-link: @5364 on //depot/perl: 729a02f2394e6a50fe8352c9471391b53e54ac40

p4raw-id: //depot/perl@5368

diff --git a/perl.c b/perl.c
index ef6a8bd..c006a63 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -908,7 +908,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
        switch (*s) {
        case 'C':
 #ifdef WIN32
-           win32_argv2utf8(aTHX_ argc-1, argv+1);
+           win32_argv2utf8(argc-1, argv+1);
            /* FALL THROUGH */
 #endif
 #ifndef PERL_STRICT_CR

diff --git a/win32/win32.c b/win32/win32.c
index 87d4111..4a7f091 100644 (file)
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4005,6 +4005,11 @@ Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst)
 }
 #endif
 
+#ifdef PERL_OBJECT
+#  undef this
+#  define this pPerl
+#endif
+
 static void
 win32_free_argvw(pTHXo_ void *ptr)
 {
@@ -4016,8 +4021,9 @@ win32_free_argvw(pTHXo_ void *ptr)
 }
 
 void
-win32_argv2utf8(pTHX_ int argc, char** argv)
+win32_argv2utf8(int argc, char** argv)
 {
+    dTHXo;
     char* psz;
     int length, wargc;
     LPWSTR* lpwStr = CommandLineToArgvW(GetCommandLineW(), &wargc);

diff --git a/win32/win32.h b/win32/win32.h
index a96e205..bbf88bb 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -321,7 +321,7 @@ extern char *               win32_get_privlib(char *pl);
 extern char *          win32_get_sitelib(char *pl);
 extern int             IsWin95(void);
 extern int             IsWinNT(void);
-extern void            win32_argv2utf8(pTHX_ int argc, char** argv);
+extern void            win32_argv2utf8(int argc, char** argv);
 
 extern char *          staticlinkmodules[];