You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mt...@apache.org on 2021/12/02 22:18:41 UTC
svn commit: r1895512 - in /apr/apr/trunk: file_io/win32/filestat.c file_io/win32/open.c misc/win32/misc.c
Author: mturk
Date: Thu Dec 2 22:18:40 2021
New Revision: 1895512
URL: http://svn.apache.org/viewvc?rev=1895512&view=rev
Log:
Get rid of check for old versions that cannot be run anyhow
Modified:
apr/apr/trunk/file_io/win32/filestat.c
apr/apr/trunk/file_io/win32/open.c
apr/apr/trunk/misc/win32/misc.c
Modified: apr/apr/trunk/file_io/win32/filestat.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/filestat.c?rev=1895512&r1=1895511&r2=1895512&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/filestat.c (original)
+++ apr/apr/trunk/file_io/win32/filestat.c Thu Dec 2 22:18:40 2021
@@ -339,8 +339,7 @@ apr_status_t more_finfo(apr_finfo_t *fin
guess_protection_bits(finfo, wanted);
}
- if ((apr_os_level >= APR_WIN_2000) && (wanted & APR_FINFO_CSIZE)
- && (finfo->filetype == APR_REG))
+ if ((wanted & APR_FINFO_CSIZE) && (finfo->filetype == APR_REG))
{
if (whatfile == MORE_OF_HANDLE) {
FILE_ALLOCATION_INFO fi;
Modified: apr/apr/trunk/file_io/win32/open.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/open.c?rev=1895512&r1=1895511&r2=1895512&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/open.c (original)
+++ apr/apr/trunk/file_io/win32/open.c Thu Dec 2 22:18:40 2021
@@ -141,14 +141,10 @@ void *res_name_from_filename(const char
apr_size_t n = strlen(file) + 1;
apr_size_t r, d;
- if (apr_os_level >= APR_WIN_2000) {
- if (global)
- wpre = L"Global\\";
- else
- wpre = L"Local\\";
- }
+ if (global)
+ wpre = L"Global\\";
else
- wpre = L"";
+ wpre = L"Local\\";
r = wcslen(wpre);
if (n > 256 - r) {
Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=1895512&r1=1895511&r2=1895512&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Thu Dec 2 22:18:40 2021
@@ -37,34 +37,9 @@ apr_status_t apr_get_oslevel(apr_oslevel
{
unsigned int servpack = oslev.wServicePackMajor;
- if (oslev.dwMajorVersion < 3) {
+ if (oslev.dwMajorVersion < 5) {
apr_os_level = APR_WIN_UNSUP;
}
- else if (oslev.dwMajorVersion == 3) {
- if (oslev.dwMajorVersion < 50) {
- apr_os_level = APR_WIN_UNSUP;
- }
- else if (oslev.dwMajorVersion == 50) {
- apr_os_level = APR_WIN_NT_3_5;
- }
- else {
- apr_os_level = APR_WIN_NT_3_51;
- }
- }
- else if (oslev.dwMajorVersion == 4) {
- if (servpack < 2)
- apr_os_level = APR_WIN_NT_4;
- else if (servpack <= 2)
- apr_os_level = APR_WIN_NT_4_SP2;
- else if (servpack <= 3)
- apr_os_level = APR_WIN_NT_4_SP3;
- else if (servpack <= 4)
- apr_os_level = APR_WIN_NT_4_SP4;
- else if (servpack <= 5)
- apr_os_level = APR_WIN_NT_4_SP5;
- else
- apr_os_level = APR_WIN_NT_4_SP6;
- }
else if (oslev.dwMajorVersion == 5) {
if (oslev.dwMinorVersion == 0) {
if (servpack == 0)