You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/03 14:45:36 UTC
svn commit: r1814196 - in /commons/proper/daemon/trunk/src/native/windows:
include/apxwin.h src/handles.c src/private.h src/utils.c
Author: markt
Date: Fri Nov 3 14:45:35 2017
New Revision: 1814196
URL: http://svn.apache.org/viewvc?rev=1814196&view=rev
Log:
Remove OS level code. It is no longer used.
Modified:
commons/proper/daemon/trunk/src/native/windows/include/apxwin.h
commons/proper/daemon/trunk/src/native/windows/src/handles.c
commons/proper/daemon/trunk/src/native/windows/src/private.h
commons/proper/daemon/trunk/src/native/windows/src/utils.c
Modified: commons/proper/daemon/trunk/src/native/windows/include/apxwin.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/apxwin.h?rev=1814196&r1=1814195&r2=1814196&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/apxwin.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/apxwin.h Fri Nov 3 14:45:35 2017
@@ -112,38 +112,6 @@ typedef _W64 int intptr_t;
__APXBEGIN_DECLS
-typedef enum {
- APX_WINVER_UNK = 0,
- APX_WINVER_UNSUP = 1,
- APX_WINVER_95 = 10,
- APX_WINVER_95_B = 11,
- APX_WINVER_95_OSR2 = 12,
- APX_WINVER_98 = 14,
- APX_WINVER_98_SE = 16,
- APX_WINVER_ME = 18,
-
- APX_WINVER_UNICODE = 20, /* Prior versions support only narrow chars */
-
- APX_WINVER_CE_3 = 23, /* CE is an odd beast, not supporting */
- /* some pre-NT features, such as the */
- APX_WINVER_NT = 30, /* narrow charset APIs (fooA fns), while */
- APX_WINVER_NT_3_5 = 35, /* not supporting some NT-family features. */
- APX_WINVER_NT_3_51 = 36,
-
- APX_WINVER_NT_4 = 40,
- APX_WINVER_NT_4_SP2 = 42,
- APX_WINVER_NT_4_SP3 = 43,
- APX_WINVER_NT_4_SP4 = 44,
- APX_WINVER_NT_4_SP5 = 45,
- APX_WINVER_NT_4_SP6 = 46,
-
- APX_WINVER_2000 = 50,
- APX_WINVER_2000_SP1 = 51,
- APX_WINVER_2000_SP2 = 52,
- APX_WINVER_XP = 60
-} APX_OSLEVEL;
-
-APX_OSLEVEL apxGetOsLevel();
LPWSTR AsciiToWide(LPCSTR s, LPWSTR ws);
LPSTR MzWideToAscii(LPCWSTR ws, LPSTR s);
LPSTR WideToANSI(LPCWSTR ws);
Modified: commons/proper/daemon/trunk/src/native/windows/src/handles.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/handles.c?rev=1814196&r1=1814195&r2=1814196&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/handles.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/handles.c Fri Nov 3 14:45:35 2017
@@ -239,7 +239,6 @@ static BOOL __apxCreateSystemPool()
HANDLE hHeap;
GetSystemInfo(&_st_sys_info);
- apxGetOsLevel();
/* First create the shared data segment */
_st_sys_page = VirtualAlloc(NULL, _st_sys_info.dwAllocationGranularity,
MEM_RESERVE, PAGE_NOACCESS);
Modified: commons/proper/daemon/trunk/src/native/windows/src/private.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/private.h?rev=1814196&r1=1814195&r2=1814196&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/private.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/private.h Fri Nov 3 14:45:35 2017
@@ -230,8 +230,6 @@ struct stAPXHANDLE {
#define APXHANDLE_DATA(h) ((void *)((char*)(h) + sizeof(stAPXHANDLE)))
#define APXHANDLE_SZ sizeof(stAPXHANDLE)
-extern APX_OSLEVEL _st_apx_oslevel;
-
/* zero separated, double zero terminated string */
struct APXMULTISZ {
DWORD dwAllocated; /* length including terminators */
Modified: commons/proper/daemon/trunk/src/native/windows/src/utils.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/utils.c?rev=1814196&r1=1814195&r2=1814196&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/utils.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/utils.c Fri Nov 3 14:45:35 2017
@@ -17,58 +17,6 @@
#include "apxwin.h"
#include "private.h"
-APX_OSLEVEL _st_apx_oslevel = APX_WINVER_UNK;
-
-/* Apache's APR stripped Os level detection */
-APX_OSLEVEL apxGetOsLevel()
-{
- if (_st_apx_oslevel == APX_WINVER_UNK) {
- static OSVERSIONINFO oslev;
- oslev.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&oslev);
-
- if (oslev.dwPlatformId == VER_PLATFORM_WIN32_NT) {
- if (oslev.dwMajorVersion < 4)
- _st_apx_oslevel = APX_WINVER_UNSUP;
- else if (oslev.dwMajorVersion == 4)
- _st_apx_oslevel = APX_WINVER_NT_4;
- else if (oslev.dwMajorVersion == 5) {
- if (oslev.dwMinorVersion == 0)
- _st_apx_oslevel = APX_WINVER_2000;
- else
- _st_apx_oslevel = APX_WINVER_XP;
- }
- else
- _st_apx_oslevel = APX_WINVER_XP;
- }
-#ifndef WINNT
- else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
- if (oslev.dwMinorVersion < 10)
- _st_apx_oslevel = APX_WINVER_95;
- else if (oslev.dwMinorVersion < 90)
- _st_apx_oslevel = APX_WINVER_98;
- else
- _st_apx_oslevel = APX_WINVER_ME;
- }
-#endif
-#ifdef _WIN32_WCE
- else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_CE) {
- if (oslev.dwMajorVersion < 3)
- _st_apx_oslevel = APX_WINVER_UNSUP;
- else
- _st_apx_oslevel = APX_WINVER_CE_3;
- }
-#endif
- else
- _st_apx_oslevel = APX_WINVER_UNSUP;
- }
-
- if (_st_apx_oslevel < APX_WINVER_UNSUP)
- return APX_WINVER_UNK;
- else
- return _st_apx_oslevel;
-}
-
LPWSTR __apxGetEnvironmentVariableW(APXHANDLE hPool, LPCWSTR wsName)
{
LPWSTR wsRet;