From c883cf8d2a320e682654d0de02b00ca552fec647 Mon Sep 17 00:00:00 2001 From: davi Date: Fri, 29 Jun 2007 17:05:11 +0000 Subject: Backport 551958 from trunk: Something in apr_private.h when preprocessed with the MinGW Windows headers effectively redefines WINADVAPI from __stdcall to empty which results in a link failure when wincrypt.h is placed after an include to apr_private.h. Submitted by: Curt Arnold git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@551959 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ misc/win32/rand.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 6b1af54b9..e2f83a431 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,10 @@ Changes for APR 1.2.10 + *) The MinGW Windows headers effectively redefines WINADVAPI from + __stdcall to empty which results in a link failure when wincrypt.h + is placed after an include to apr_private.h. + PR 42293. [Curt Arnold] + *) Define SEM_FAILED if it isn't already defined, as the proc mutex code already does it. Also search for the sem_open function in the realtime library. (This fixes HP-UX sem_open detection). diff --git a/misc/win32/rand.c b/misc/win32/rand.c index 8af1bdad5..7161bfbbd 100644 --- a/misc/win32/rand.c +++ b/misc/win32/rand.c @@ -14,9 +14,8 @@ * limitations under the License. */ -#include -#include #include "apr.h" +#include #include "apr_private.h" #include "apr_general.h" #include "apr_portable.h" -- cgit v1.2.1