diff options
| author | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-02 22:18:40 +0000 |
|---|---|---|
| committer | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-02 22:18:40 +0000 |
| commit | 55a24874335ddce53a8263247bedd463a90c334f (patch) | |
| tree | 8bf56099d71684421f427e7f269f32e96c8e5c5a | |
| parent | c41dcfb839423ad6a71e883c1d2a859e96e79aa1 (diff) | |
| download | libapr-55a24874335ddce53a8263247bedd463a90c334f.tar.gz | |
Get rid of check for old versions that cannot be run anyhow
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895512 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | file_io/win32/filestat.c | 3 | ||||
| -rw-r--r-- | file_io/win32/open.c | 10 | ||||
| -rw-r--r-- | misc/win32/misc.c | 27 |
3 files changed, 5 insertions, 35 deletions
diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c index 3f2a391d1..e8e52fdd4 100644 --- a/file_io/win32/filestat.c +++ b/file_io/win32/filestat.c @@ -339,8 +339,7 @@ apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile, 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; diff --git a/file_io/win32/open.c b/file_io/win32/open.c index 5530591eb..18d01e064 100644 --- a/file_io/win32/open.c +++ b/file_io/win32/open.c @@ -141,14 +141,10 @@ void *res_name_from_filename(const char *file, int global, apr_pool_t *pool) 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) { diff --git a/misc/win32/misc.c b/misc/win32/misc.c index 295a08fb0..0ae3b6ff0 100644 --- a/misc/win32/misc.c +++ b/misc/win32/misc.c @@ -37,34 +37,9 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level) { 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) |