svn commit: r421805 - in /apr/apr/trunk: configure.in misc/win32/rand.c

[je...@apache.org]

Author: jerenkrantz
Date: Thu Jul 13 21:45:22 2006
New Revision: 421805

URL: http://svn.apache.org/viewvc?rev=421805&view=rev
Log:
Link to librpcrt4.a.

Rearrange header ordering in rand.c to ensure that the link decorations
are imported correctly.

Originally titled: [patch 17/17] Uuid

Submitted by: John Vandenberg
Reviewed by: Justin Erenkrantz

Modified:
    apr/apr/trunk/configure.in
    apr/apr/trunk/misc/win32/rand.c

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=421805&r1=421804&r2=421805&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Thu Jul 13 21:45:22 2006
@@ -538,6 +538,7 @@
       APR_CHECK_DLL_FUNC(shell32, CommandLineToArgvW@8)
       APR_CHECK_DLL_FUNC(kernel32,[CreateFileMappingA@24],
          [ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA])
+      APR_CHECK_DLL_FUNC(rpcrt4,[UuidCreate@4])
       ;;
    *)
       AC_SEARCH_LIBS(gethostbyname, nsl)

Modified: apr/apr/trunk/misc/win32/rand.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/rand.c?rev=421805&r1=421804&r2=421805&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/rand.c (original)
+++ apr/apr/trunk/misc/win32/rand.c Thu Jul 13 21:45:22 2006
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include <windows.h>
+#include <wincrypt.h>
 #include "apr.h"
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_portable.h"
 #include "apr_arch_misc.h"
-#include <wincrypt.h>
 
 
 APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf,