apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1559408 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h libapr.rc misc/win32/misc.c
Date Sat, 18 Jan 2014 20:15:13 GMT
Author: trawick
Date: Sat Jan 18 20:15:12 2014
New Revision: 1559408

URL: http://svn.apache.org/r1559408
Log:
Remove more Win9x support (trunk only).

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_misc.h
    apr/apr/trunk/libapr.rc
    apr/apr/trunk/misc/win32/misc.c

Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?rev=1559408&r1=1559407&r2=1559408&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Sat Jan 18 20:15:12 2014
@@ -122,11 +122,7 @@ apr_status_t apr_get_oslevel(apr_oslevel
  * the unicode eqivilant.
  */
 
-#if defined(_WIN32_WCE) || defined(WINNT)
 #define APR_HAS_ANSI_FS           0
-#else
-#define APR_HAS_ANSI_FS           1
-#endif
 
 /* IF_WIN_OS_IS_UNICODE / ELSE_WIN_OS_IS_ANSI help us keep the code trivial
  * where have runtime tests for unicode-ness, that aren't needed in any
@@ -138,7 +134,7 @@ apr_status_t apr_get_oslevel(apr_oslevel
 #else /* APR_HAS_UNICODE_FS */
 #define IF_WIN_OS_IS_UNICODE
 #define ELSE_WIN_OS_IS_ANSI
-#endif /* WINNT */
+#endif /* APR_HAS_ANSI_FS && APR_HAS_UNICODE_FS */
 
 #if defined(_MSC_VER) && !defined(_WIN32_WCE)
 #include "crtdbg.h"
@@ -223,102 +219,6 @@ FARPROC apr_load_dll_func(apr_dlltoken_e
  * In the case of non-text functions, simply #define the original name
  */
 
-#if !defined(_WIN32_WCE) && !defined(WINNT)
-/* This group is available to all versions of WINNT 4.0 SP6 and later */
-
-#ifdef GetFileAttributesExA
-#undef GetFileAttributesExA
-#endif
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
-    IN LPCSTR lpFileName,
-    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
-    OUT LPVOID lpFileInformation),
-    (lpFileName, fInfoLevelId, lpFileInformation));
-#define GetFileAttributesExA apr_winapi_GetFileAttributesExA
-#undef GetFileAttributesEx
-#define GetFileAttributesEx apr_winapi_GetFileAttributesExA
-
-#ifdef GetFileAttributesExW
-#undef GetFileAttributesExW
-#endif
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExW, 0, (
-    IN LPCWSTR lpFileName,
-    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
-    OUT LPVOID lpFileInformation),
-    (lpFileName, fInfoLevelId, lpFileInformation));
-#define GetFileAttributesExW apr_winapi_GetFileAttributesExW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
-    IN HANDLE hFile),
-    (hFile));
-#define CancelIo apr_winapi_CancelIo
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, TryEnterCriticalSection, 0, (
-    LPCRITICAL_SECTION lpCriticalSection),
-    (lpCriticalSection));
-#define TryEnterCriticalSection apr_winapi_TryEnterCriticalSection
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SwitchToThread, 0, (
-    void),
-    ());
-#define SwitchToThread apr_winapi_SwitchToThread
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetEffectiveRightsFromAclW, 0, (
-    IN PACL pacl,
-    IN PTRUSTEE_W pTrustee,
-    OUT PACCESS_MASK pAccessRights),
-    (pacl, pTrustee, pAccessRights));
-#define GetEffectiveRightsFromAclW apr_winapi_GetEffectiveRightsFromAclW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoW, 0, (
-    IN LPWSTR pObjectName,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetNamedSecurityInfoW apr_winapi_GetNamedSecurityInfoW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoA, 0, (
-    IN LPSTR pObjectName,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetNamedSecurityInfoA apr_winapi_GetNamedSecurityInfoA
-#undef GetNamedSecurityInfo
-#define GetNamedSecurityInfo apr_winapi_GetNamedSecurityInfoA
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetSecurityInfo, 0, (
-    IN HANDLE handle,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetSecurityInfo apr_winapi_GetSecurityInfo
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI, CommandLineToArgvW, 0, (
-    LPCWSTR lpCmdLine, 
-    int *pNumArgs),
-    (lpCmdLine, pNumArgs));
-#define CommandLineToArgvW apr_winapi_CommandLineToArgvW
-
-#endif /* !defined(_WIN32_WCE) && !defined(WINNT) */
-
 #if !defined(_WIN32_WCE)
 /* This group is NOT available to all versions of WinNT,
  * these we must always look up

Modified: apr/apr/trunk/libapr.rc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/libapr.rc?rev=1559408&r1=1559407&r2=1559408&view=diff
==============================================================================
--- apr/apr/trunk/libapr.rc (original)
+++ apr/apr/trunk/libapr.rc Sat Jan 18 20:15:12 2014
@@ -40,11 +40,7 @@
  FILEFLAGS 0x00L
 #endif
 #endif
-#if defined(WINNT) || defined(WIN64)
  FILEOS 0x40004L
-#else
- FILEOS 0x4L
-#endif
  FILETYPE 0x2L
  FILESUBTYPE 0x0L
 BEGIN

Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=1559408&r1=1559407&r2=1559408&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Sat Jan 18 20:15:12 2014
@@ -106,33 +106,6 @@ apr_status_t apr_get_oslevel(apr_oslevel
                 apr_os_level = APR_WIN_XP;
             }
         }
-#ifndef WINNT
-        else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-            TCHAR *prevision;
-            if (prevision = oslev.szCSDVersion) {
-                while (*prevision && !apr_isupper(*prevision)) {
-                     prevision++;
-                }
-            }
-            else prevision = _T("");
-
-            if (oslev.dwMinorVersion < 10) {
-                if (*prevision < _T('C'))
-                    apr_os_level = APR_WIN_95;
-                else
-                    apr_os_level = APR_WIN_95_OSR2;
-            }
-            else if (oslev.dwMinorVersion < 90) {
-                if (*prevision < _T('A'))
-                    apr_os_level = APR_WIN_98;
-                else
-                    apr_os_level = APR_WIN_98_SE;
-            }
-            else {
-                apr_os_level = APR_WIN_ME;
-            }
-        }
-#endif
 #ifdef _WIN32_WCE
         else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_CE) 
         {



Mime
View raw message