Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 82931 invoked from network); 26 Aug 2010 06:12:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Aug 2010 06:12:33 -0000 Received: (qmail 88868 invoked by uid 500); 26 Aug 2010 06:12:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 88756 invoked by uid 500); 26 Aug 2010 06:12:30 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 88745 invoked by uid 99); 26 Aug 2010 06:12:30 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Aug 2010 06:12:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Aug 2010 06:12:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DDA1923889DA; Thu, 26 Aug 2010 06:10:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r989450 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h misc/win32/misc.c Date: Thu, 26 Aug 2010 06:10:54 -0000 To: commits@apr.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100826061054.DDA1923889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Thu Aug 26 06:10:54 2010 New Revision: 989450 URL: http://svn.apache.org/viewvc?rev=989450&view=rev Log: Add Windows 7 to the list of detected versions 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/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?rev=989450&r1=989449&r2=989450&view=diff ============================================================================== --- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original) +++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Thu Aug 26 06:10:54 2010 @@ -104,7 +104,8 @@ typedef enum { APR_WIN_XP_SP1 = 61, APR_WIN_XP_SP2 = 62, APR_WIN_2003 = 70, - APR_WIN_VISTA = 80 + APR_WIN_VISTA = 80, + APR_WIN_7 = 90 } 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/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=989450&r1=989449&r2=989450&view=diff ============================================================================== --- apr/apr/trunk/misc/win32/misc.c (original) +++ apr/apr/trunk/misc/win32/misc.c Thu Aug 26 06:10:54 2010 @@ -98,7 +98,10 @@ apr_status_t apr_get_oslevel(apr_oslevel } } else if (oslev.dwMajorVersion == 6) { - apr_os_level = APR_WIN_VISTA; + if (oslev.dwMinorVersion == 0) + apr_os_level = APR_WIN_VISTA; + else + apr_os_level = APR_WIN_7; } else { apr_os_level = APR_WIN_XP;