diff options
| author | davi <davi@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-29 17:05:11 +0000 |
|---|---|---|
| committer | davi <davi@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-29 17:05:11 +0000 |
| commit | c883cf8d2a320e682654d0de02b00ca552fec647 (patch) | |
| tree | b0f06c66871846ad66efa46d1c121793bac80651 | |
| parent | af12e59c31426573328310fa75860e83829ee055 (diff) | |
| download | libapr-c883cf8d2a320e682654d0de02b00ca552fec647.tar.gz | |
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
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | misc/win32/rand.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -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 <windows.h> -#include <wincrypt.h> #include "apr.h" +#include <wincrypt.h> #include "apr_private.h" #include "apr_general.h" #include "apr_portable.h" |