Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5370

4 files changed, 9 insertions, 9 deletions

diff --git a/perl.c b/perl.c
index ef6a8bdbf2..c006a63480 100644
--- 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/perl.h b/perl.h
index f5dfacc0d0..6bf8809498 100644
--- a/perl.h
+++ b/perl.h
@@ -1418,12 +1418,7 @@ typedef struct ptr_tbl PTR_TBL_t;
 
 #include "handy.h"
 
-#ifndef NO_LARGE_FILES
-#   define USE_LARGE_FILES	/* If available. */
-#endif
-
 #if defined(USE_LARGE_FILES) && !defined(NO_64_BIT_RAWIO)
-#   define USE_64_BIT_RAWIO	/* explicit */
 #   if LSEEKSIZE == 8 && !defined(USE_64_BIT_RAWIO)
 #       define USE_64_BIT_RAWIO	/* implicit */
 #   endif
@@ -1441,7 +1436,6 @@ typedef struct ptr_tbl PTR_TBL_t;
 #endif
 
 #if defined(USE_LARGE_FILES) && !defined(NO_64_BIT_STDIO)
-#   define USE_64_BIT_STDIO	/* explicit */
 #   if FSEEKSIZE == 8 && !defined(USE_64_BIT_STDIO)
 #       define USE_64_BIT_STDIO /* implicit */
 #   endif
diff --git a/win32/win32.c b/win32/win32.c
index 87d4111609..4a7f091797 100644
--- 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 a96e20598a..bbf88bb1e5 100644
--- 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[];