From 4019064c5d866015a0d78b32dd051ec1dacf8ebf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 25 Oct 2005 13:43:37 +0000
Subject: r11294: Update Heimdal in Samba4 to lorikeet-heimdal (which is in
 turn updated to CVS of 2005-10-24).

Andrew Bartlett
(This used to be commit 939d4f340feaad15d0a6a5da79feba2b2558f174)
---
 source4/heimdal/lib/roken/roken-common.h |  6 +++---
 source4/heimdal/lib/roken/roken.h        | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'source4/heimdal/lib/roken')

diff --git a/source4/heimdal/lib/roken/roken-common.h b/source4/heimdal/lib/roken/roken-common.h
index c4ba2edb7c..8368530ff7 100644
--- a/source4/heimdal/lib/roken/roken-common.h
+++ b/source4/heimdal/lib/roken/roken-common.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: roken-common.h,v 1.62 2005/09/01 18:47:35 lha Exp $ */
+/* $Id: roken-common.h,v 1.64 2005/09/28 03:05:58 lha Exp $ */
 
 #ifndef __ROKEN_COMMON_H__
 #define __ROKEN_COMMON_H__
@@ -258,8 +258,6 @@
 #define __attribute__(x)
 #endif
 
-#define rk_UNCONST(x) ((void *)(unsigned long)(const void *)(x))
-
 ROKEN_CPP_START
 
 #ifndef IRIX4 /* fix for compiler bug */
@@ -396,6 +394,8 @@ rk_strpoolprintf(struct rk_strpool *, const char *, ...)
 void ROKEN_LIB_FUNCTION
 rk_strpoolfree(struct rk_strpool *);
 
+void ROKEN_LIB_FUNCTION
+rk_dumpdata (const char *, const void *, size_t);
 
 ROKEN_CPP_END
 
diff --git a/source4/heimdal/lib/roken/roken.h b/source4/heimdal/lib/roken/roken.h
index 04553caf48..853de9b112 100644
--- a/source4/heimdal/lib/roken/roken.h
+++ b/source4/heimdal/lib/roken/roken.h
@@ -32,11 +32,14 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: roken.h.in,v 1.177 2005/08/05 09:06:29 lha Exp $ */
+/* $Id: roken.h.in,v 1.178 2005/09/28 03:04:54 lha Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include <string.h>
 #include <signal.h>
 
@@ -138,6 +141,12 @@ typedef int ssize_t;
 
 ROKEN_CPP_START
 
+#ifdef HAVE_UINTPTR_T
+#define rk_UNCONST(x) ((void *)(uintptr_t)(const void *)(x))
+#else
+#define rk_UNCONST(x) ((void *)(unsigned long)(const void *)(x))
+#endif
+
 #if !defined(HAVE_SETSID) && defined(HAVE__SETSID)
 #define setsid _setsid
 #endif
-- 
cgit