r4472: improve the discard_const() macro for standalone build of talloc

(This used to be commit 310cea15bf01343d9ab8ff7a166f0699c0507816)

diff --git a/source4/lib/talloc.c b/source4/lib/talloc.c
index 7f502648011e55b59069ef9e245e3fec5ad47e79..ce1a325ebd72364efd4ca524fa41efc0363ec38a 100644 (file)
--- a/source4/lib/talloc.c
+++ b/source4/lib/talloc.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include "talloc.h"
 #endif
 
@@ -54,7 +55,11 @@
 #endif
 
 #ifndef discard_const_p
-#define discard_const_p(type, ptr) ((type *)(ptr))
+#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T)
+# define discard_const_p(type, ptr) ((type *)((intptr_t)(ptr)))
+#else
+# define discard_const_p(type, ptr) ((type *)(ptr))
+#endif
 #endif
 
 /* this null_context is only used if talloc_enable_leak_report() or