diff options
| author | Nicholas Clark <nick@ccl4.org> | 2004-03-06 19:38:52 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2004-03-06 19:38:52 +0000 |
| commit | 5b1a16ca7ebdd6395389fd5b9ffdc607a64c595d (patch) | |
| tree | cd8af87ab90798c30a8b0fda7502c83958206532 /win32/win32.c | |
| parent | 07cd3697b357f5e60798a58222f1ffd6dae33031 (diff) | |
| download | perl-5b1a16ca7ebdd6395389fd5b9ffdc607a64c595d.tar.gz | |
Integrate:
[ 22421]
Subject: [PATCH] nmake distclean cleans too much from lib/Digest on Win32
From: Steve Hay <steve.hay@uk.radan.com>
Date: Fri, 27 Feb 2004 17:42:26 +0000
Message-ID: <403F8182.5090607@uk.radan.com>
[ 22431]
Fix [perl #27357] Scalar Win32::GetOSVersion() broken in 5.8.3
(by Steve Hay)
[ 22442]
Subject: [PATCH] Fix PERLEXE_ICO/PERLEXE_RES targets in makefile.mk on Win32
From: steve.hay@uk.radan.com (Steve Hay)
Date: Fri, 05 Mar 2004 09:42:32 +0000
Message-ID: <40484B88.7070608@uk.radan.com>
p4raw-link: @22442 on //depot/perl: 4fe8ccd6f3a643c1e935d8a605fe1a817a041085
p4raw-link: @22431 on //depot/perl: 95015c6ec741dc7f61e7b9c294102b0f8e739263
p4raw-link: @22421 on //depot/perl: 051696ff3e39f65e14b8a0b9c9470826241ed0b3
p4raw-id: //depot/maint-5.8/perl@22450
p4raw-branched: from //depot/perl@22449 'branch in'
t/win32/getosversion.t
p4raw-integrated: from //depot/perl@22449 'merge in' win32/win32.c
(@21992..) win32/Makefile (@22318..) MANIFEST (@22347..)
p4raw-integrated: from //depot/perl@22421 'edit in' win32/makefile.mk
(@22318..)
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 69b0ca2da7..cba6009400 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4618,6 +4618,9 @@ XS(w32_GetOSVersion) XSRETURN_EMPTY; } } + if (GIMME_V == G_SCALAR) { + XSRETURN_IV(osverw.dwPlatformId); + } W2AHELPER(osverw.szCSDVersion, szCSDVersion, sizeof(szCSDVersion)); XPUSHs(newSVpvn(szCSDVersion, strlen(szCSDVersion))); osver.dwMajorVersion = osverw.dwMajorVersion; @@ -4638,6 +4641,9 @@ XS(w32_GetOSVersion) XSRETURN_EMPTY; } } + if (GIMME_V == G_SCALAR) { + XSRETURN_IV(osver.dwPlatformId); + } XPUSHs(newSVpvn(osver.szCSDVersion, strlen(osver.szCSDVersion))); } XPUSHs(newSViv(osver.dwMajorVersion)); |