[patch 17/17] Uuid

[John Mark Vandenberg <ja...@gmail.com>]

Include librpcrt4.a.

Include <windows.h> & <wincrypt.h> first.  Without this, the symbols
used from librpcrt4.a dont include the @<arg count>, causing the link
to fail.

Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -1916,6 +1916,8 @@ echo "${nl}Checking for OS UUID Support.
 
 AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h, break)
 
+AX_CHECK_DLL_FUNC(rpcrt4,UuidCreate@4)
+
 apr_revert_save_LIBS=$LIBS
 
 # Prefer the flavor(s) that live in libc;
Index: misc/win32/rand.c
===================================================================
--- misc/win32/rand.c.orig
+++ misc/win32/rand.c
@@ -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,

--

Re: [patch 17/17] Uuid

[Justin Erenkrantz <ju...@erenkrantz.com>]

On 4/14/06, John Mark Vandenberg <ja...@gmail.com> wrote:
> Include librpcrt4.a.
>
> Include <windows.h> & <wincrypt.h> first.  Without this, the symbols
> used from librpcrt4.a dont include the @<arg count>, causing the link
> to fail.

Committed in r421805.  Thanks!  -- justin