diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 14 | ||||
| -rw-r--r-- | win32/win32thread.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/win32/win32.c b/win32/win32.c index 1f7883bc52..13f11e3cc7 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -474,7 +474,7 @@ do_aspawn(void *vreally, void **vmark, void **vsp) } while (++mark <= sp) { - if (*mark && (str = SvPV(*mark, na))) + if (*mark && (str = SvPV(*mark, PL_na))) argv[index++] = str; else argv[index++] = ""; @@ -482,7 +482,7 @@ do_aspawn(void *vreally, void **vmark, void **vsp) argv[index++] = 0; status = win32_spawnvp(flag, - (const char*)(really ? SvPV(really,na) : argv[0]), + (const char*)(really ? SvPV(really,PL_na) : argv[0]), (const char* const*)argv); if (status < 0 && errno == ENOEXEC) { @@ -495,7 +495,7 @@ do_aspawn(void *vreally, void **vmark, void **vsp) argv[sh_items] = w32_perlshell_vec[sh_items]; status = win32_spawnvp(flag, - (const char*)(really ? SvPV(really,na) : argv[0]), + (const char*)(really ? SvPV(really,PL_na) : argv[0]), (const char* const*)argv); } @@ -2122,7 +2122,7 @@ XS(w32_SetCwd) dXSARGS; if (items != 1) croak("usage: Win32::SetCurrentDirectory($cwd)"); - if (SetCurrentDirectory(SvPV(ST(0),na))) + if (SetCurrentDirectory(SvPV(ST(0),PL_na))) XSRETURN_YES; XSRETURN_NO; @@ -2305,8 +2305,8 @@ XS(w32_Spawn) if (items != 3) croak("usage: Win32::Spawn($cmdName, $args, $PID)"); - cmd = SvPV(ST(0),na); - args = SvPV(ST(1), na); + cmd = SvPV(ST(0),PL_na); + args = SvPV(ST(1), PL_na); memset(&stStartInfo, 0, sizeof(stStartInfo)); /* Clear the block */ stStartInfo.cb = sizeof(stStartInfo); /* Set the structure size */ @@ -2362,7 +2362,7 @@ XS(w32_GetShortPathName) ST(0) = shortpath; } else - ST(0) = &sv_undef; + ST(0) = &PL_sv_undef; XSRETURN(1); } diff --git a/win32/win32thread.c b/win32/win32thread.c index e91830d38d..14ac5d7f42 100644 --- a/win32/win32thread.c +++ b/win32/win32thread.c @@ -18,7 +18,7 @@ Perl_setTHR(struct perl_thread *t) #ifdef USE_DECLSPEC_THREAD Perl_current_thread = t; #else - TlsSetValue(thr_key,t); + TlsSetValue(PL_thr_key,t); #endif #endif } @@ -30,7 +30,7 @@ Perl_getTHR(void) #ifdef USE_DECLSPEC_THREAD return Perl_current_thread; #else - return (struct perl_thread *) TlsGetValue(thr_key); + return (struct perl_thread *) TlsGetValue(PL_thr_key); #endif #else return NULL; @@ -43,7 +43,7 @@ Perl_alloc_thread_key(void) #ifdef USE_THREADS static int key_allocated = 0; if (!key_allocated) { - if ((thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) + if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) croak("panic: TlsAlloc"); key_allocated = 1; } |