You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2013/10/06 21:49:05 UTC
svn commit: r1529671 - in /apr/apr/branches/1.5.x: ./ CHANGES
build/apr_hints.m4 include/apr.h.in
Author: trawick
Date: Sun Oct 6 19:49:04 2013
New Revision: 1529671
URL: http://svn.apache.org/r1529671
Log:
Merge r1529521 and r1529668 from trunk:
Don't include windows.h when building for Cygwin.
PR: 55586
Submitted by: Carlo Bramini <carlo.bramix libero.it>
Cygwin: Don't define unused symbol "CYGWIN". (__CYGWIN__ is used instead.)
PR: 51016
Submitted by: Carlo Bramini <carlo.bramix libero.it>
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/CHANGES
apr/apr/branches/1.5.x/build/apr_hints.m4
apr/apr/branches/1.5.x/include/apr.h.in
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1529521,1529668
Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1529671&r1=1529670&r2=1529671&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Sun Oct 6 19:49:04 2013
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.5.0
+ *) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini
+ <carlo.bramix libero.it>]
+
*) Add apr_skiplist family. [Jim Jagielski]
*) Add experimental cmake-based build system for Windows. Refer to
Modified: apr/apr/branches/1.5.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/apr_hints.m4?rev=1529671&r1=1529670&r2=1529671&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.5.x/build/apr_hints.m4 Sun Oct 6 19:49:04 2013
@@ -430,9 +430,6 @@ dnl # Not a problem in 10.20. Ot
APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
APR_SETIFNULL(apr_getservbyname_is_thread_safe, [yes])
;;
- *cygwin*)
- APR_ADDTO(CPPFLAGS, [-DCYGWIN])
- ;;
*mingw*)
APR_ADDTO(INTERNAL_CPPFLAGS, -DBINPATH=$apr_builddir/test/.libs)
APR_ADDTO(CPPFLAGS, [-DWIN32 -D__MSVCRT__])
Modified: apr/apr/branches/1.5.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr.h.in?rev=1529671&r1=1529670&r2=1529671&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr.h.in (original)
+++ apr/apr/branches/1.5.x/include/apr.h.in Sun Oct 6 19:49:04 2013
@@ -116,7 +116,7 @@
* or the extern "C" namespace
*/
-#if APR_HAVE_WINDOWS_H
+#if APR_HAVE_WINDOWS_H && defined(WIN32)
/* If windows.h was already included, our preferences don't matter.
* If not, include a restricted set of windows headers to our tastes.
*/