Author: mturk Date: Mon Jan 17 04:26:58 2005 New Revision: 125411 URL: http://svn.apache.org/viewcvs?view=rev&rev=125411 Log: Added detection for XP_SP1, XP_SP2 and 2003. Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h apr/apr/trunk/misc/win32/misc.c
Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h Url: http://svn.apache.org/viewcvs/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?view=diff&rev=125411&p1=apr/apr/trunk/include/arch/win32/apr_arch_misc.h&r1=125410&p2=apr/apr/trunk/include/arch/win32/apr_arch_misc.h&r2=125411 ============================================================================== --- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original) +++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Mon Jan 17 04:26:58 2005 @@ -99,7 +99,10 @@ APR_WIN_2000 = 50, APR_WIN_2000_SP1 = 51, APR_WIN_2000_SP2 = 52, - APR_WIN_XP = 60 + APR_WIN_XP = 60, + APR_WIN_XP_SP1 = 61, + APR_WIN_XP_SP2 = 62, + APR_WIN_2003 = 70 } apr_oslevel_e; extern APR_DECLARE_DATA apr_oslevel_e apr_os_level; Modified: apr/apr/trunk/misc/win32/misc.c Url: http://svn.apache.org/viewcvs/apr/apr/trunk/misc/win32/misc.c?view=diff&rev=125411&p1=apr/apr/trunk/misc/win32/misc.c&r1=125410&p2=apr/apr/trunk/misc/win32/misc.c&r2=125411 ============================================================================== --- apr/apr/trunk/misc/win32/misc.c (original) +++ apr/apr/trunk/misc/win32/misc.c Mon Jan 17 04:26:58 2005 @@ -79,8 +79,16 @@ else apr_os_level = APR_WIN_2000_SP2; } + else if (oslev.dwMinorVersion == 2) { + apr_os_level = APR_WIN_2003; + } else { - apr_os_level = APR_WIN_XP; + if (servpack < 1) + apr_os_level = APR_WIN_XP; + else if (servpack == 1) + apr_os_level = APR_WIN_XP_SP1; + else + apr_os_level = APR_WIN_XP_SP2; } } else {
