Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 114C010683 for ; Sun, 8 Sep 2013 16:58:59 +0000 (UTC) Received: (qmail 38900 invoked by uid 500); 8 Sep 2013 16:58:58 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 38802 invoked by uid 500); 8 Sep 2013 16:58:58 -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 38795 invoked by uid 99); 8 Sep 2013 16:58:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Sep 2013 16:58:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 08 Sep 2013 16:58:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B13042388831; Sun, 8 Sep 2013 16:58:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1520880 - in /apr/apr/branches/1.4.x: ./ CMakeLists.txt README.cmake include/apr.hwc Date: Sun, 08 Sep 2013 16:58:36 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130908165836.B13042388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Sun Sep 8 16:58:36 2013 New Revision: 1520880 URL: http://svn.apache.org/r1520880 Log: merge r15207=879 from trunk: Allow control over the setting of _WINNT_WINNT Default minimum Windows version: 0x0600 (Vista/Windows Server 2008) Modified: apr/apr/branches/1.4.x/ (props changed) apr/apr/branches/1.4.x/CMakeLists.txt apr/apr/branches/1.4.x/README.cmake apr/apr/branches/1.4.x/include/apr.hwc Propchange: apr/apr/branches/1.4.x/ ------------------------------------------------------------------------------ Merged /apr/apr/trunk:r1520879 Modified: apr/apr/branches/1.4.x/CMakeLists.txt URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CMakeLists.txt?rev=1520880&r1=1520879&r2=1520880&view=diff ============================================================================== --- apr/apr/branches/1.4.x/CMakeLists.txt (original) +++ apr/apr/branches/1.4.x/CMakeLists.txt Sun Sep 8 16:58:36 2013 @@ -23,6 +23,8 @@ OPTION(APR_INSTALL_PRIVATE_H "Install s OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(APR_SHOW_SETTINGS "Show the build configuration" ON) OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) +SET(MIN_WINDOWS_VER "Vista" + CACHE STRING "Minimum Windows version") # create 1-or-0 representation of feature tests for apr.h @@ -32,6 +34,16 @@ IF(APR_HAVE_IPV6) SET(apr_have_ipv6_10 1) ENDIF() +IF("${MIN_WINDOWS_VER}" STREQUAL "") + SET(win32_winnt_str "0x0600") +ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista") + SET(win32_winnt_str "0x0600") +ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7") + SET(win32_winnt_str "0x0601") +ELSE() + SET(win32_winnt_str ${MIN_WINDOWS_VER}) +ENDIF() + CONFIGURE_FILE(include/apr.hwc ${PROJECT_BINARY_DIR}/apr.h) @@ -312,6 +324,7 @@ IF(APR_SHOW_SETTINGS) MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") + MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}") ENDIF(APR_SHOW_SETTINGS) Modified: apr/apr/branches/1.4.x/README.cmake URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/README.cmake?rev=1520880&r1=1520879&r2=1520880&view=diff ============================================================================== --- apr/apr/branches/1.4.x/README.cmake (original) +++ apr/apr/branches/1.4.x/README.cmake Sun Sep 8 16:58:36 2013 @@ -63,6 +63,15 @@ How to build Default: ON APR_BUILD_TESTAPR Build APR test suite Default: OFF + MIN_WINDOWS_VER Minimum Windows version supported by this build + (This controls the setting of _WIN32_WINNT.) + "Vista" or "Windows7" or a numeric value like + "0x0601" + Default: "Vista" + For desktop/server equivalence or other values, + refer to + http://msdn.microsoft.com/en-us/library/windows/ + desktop/aa383745(v=vs.85).aspx CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL Modified: apr/apr/branches/1.4.x/include/apr.hwc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hwc?rev=1520880&r1=1520879&r2=1520880&view=diff ============================================================================== --- apr/apr/branches/1.4.x/include/apr.hwc (original) +++ apr/apr/branches/1.4.x/include/apr.hwc Sun Sep 8 16:58:36 2013 @@ -81,10 +81,7 @@ #define WIN32_LEAN_AND_MEAN #endif #ifndef _WIN32_WINNT - -/* Restrict the server to a subset of Windows XP header files by default - */ -#define _WIN32_WINNT 0x0501 +#define _WIN32_WINNT @win32_winnt_str@ #endif #ifndef NOUSER #define NOUSER