svn commit: r551959 - in /apr/apr/branches/1.2.x: CHANGES misc/win32/rand.c

[da...@apache.org]

Author: davi
Date: Fri Jun 29 10:05:11 2007
New Revision: 551959

URL: http://svn.apache.org/viewvc?view=rev&rev=551959
Log:
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


Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/misc/win32/rand.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=diff&rev=551959&r1=551958&r2=551959
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Fri Jun 29 10:05:11 2007
@@ -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).

Modified: apr/apr/branches/1.2.x/misc/win32/rand.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/misc/win32/rand.c?view=diff&rev=551959&r1=551958&r2=551959
==============================================================================
--- apr/apr/branches/1.2.x/misc/win32/rand.c (original)
+++ apr/apr/branches/1.2.x/misc/win32/rand.c Fri Jun 29 10:05:11 2007
@@ -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"