diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2003-05-06 10:58:27 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2003-05-06 10:58:27 +0000 |
| commit | 2793b1da445b3d7a70c34cbaa951dbacdd7b2d3e (patch) | |
| tree | debd042615883ad69fd18c1fbcb48e99b85183fb /win32/win32.c | |
| parent | 2b881ee74bf7aab1bea94d803004757f3ae0c571 (diff) | |
| parent | 1aad1664cf756e015147414b107d6e07ef43c6bc (diff) | |
| download | perl-2793b1da445b3d7a70c34cbaa951dbacdd7b2d3e.tar.gz | |
Integrate mainline
p4raw-id: //depot/perlio@19434
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c index 87665ff372..f3281f39ce 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3971,7 +3971,7 @@ win32_execvp(const char *cmdname, const char *const *argv) /* if this is a pseudo-forked child, we just want to spawn * the new program, and return */ if (w32_pseudo_id) { - int status = win32_spawnvp(P_WAIT, cmdname, (char *const *)argv); + int status = win32_spawnvp(P_WAIT, cmdname, (const char *const *)argv); if (status != -1) { my_exit(status); return 0; @@ -4429,11 +4429,11 @@ XS(w32_DomainName) /* NERR_Success *is* 0*/ if (0 == pfnNetWkstaGetInfo(NULL, 100, &pwi)) { if (pwi->wki100_langroup && *(pwi->wki100_langroup)) { - WideCharToMultiByte(CP_ACP, NULL, pwi->wki100_langroup, + WideCharToMultiByte(CP_ACP, 0, pwi->wki100_langroup, -1, (LPSTR)dname, dnamelen, NULL, NULL); } else { - WideCharToMultiByte(CP_ACP, NULL, pwi->wki100_computername, + WideCharToMultiByte(CP_ACP, 0, pwi->wki100_computername, -1, (LPSTR)dname, dnamelen, NULL, NULL); } pfnNetApiBufferFree(pwi); |