From 26c6b4c70bd85d8030a96651f2a255a4d48fcda1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 01:42:45 +0000
Subject: r3449: more include file reduction

the ldb part isn't ideal, I will have to think of a better solution
(This used to be commit 6b1f86aea8427a8e957b1aeb0ec2f507297f07cb)
---
 source4/lib/genrand.c              | 1 +
 source4/lib/ldb/common/ldb_ldif.c  | 1 +
 source4/lib/ldb/common/ldb_parse.c | 1 +
 source4/lib/ldb/common/ldb_utf8.c  | 1 +
 source4/lib/ldb/include/includes.h | 8 ++++++++
 source4/lib/socket/access.c        | 1 +
 source4/lib/tdb/tools/tdbdump.c    | 1 +
 source4/lib/util.c                 | 1 +
 source4/lib/util_str.c             | 1 +
 source4/lib/util_unistr.c          | 1 +
 10 files changed, 17 insertions(+)

(limited to 'source4/lib')

diff --git a/source4/lib/genrand.c b/source4/lib/genrand.c
index 11771b32c9..7289719791 100644
--- a/source4/lib/genrand.c
+++ b/source4/lib/genrand.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 static unsigned char hash[258];
 static uint32 counter;
diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c
index c693d211a9..01706304d9 100644
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/source4/lib/ldb/common/ldb_ldif.c
@@ -37,6 +37,7 @@
 */
 
 #include "includes.h"
+#include <ctype.h>
 
 
 /*
diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c
index b037284a24..feec8fc0f2 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -43,6 +43,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb_parse.h"
+#include <ctype.h>
 
 
 /*
diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c
index 1e467d23af..e92d318bae 100644
--- a/source4/lib/ldb/common/ldb_utf8.c
+++ b/source4/lib/ldb/common/ldb_utf8.c
@@ -33,6 +33,7 @@
  */
 
 #include "includes.h"
+#include <ctype.h>
 
 /*
   TODO:
diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h
index 1d3ac2a50e..44ff672266 100644
--- a/source4/lib/ldb/include/includes.h
+++ b/source4/lib/ldb/include/includes.h
@@ -28,3 +28,11 @@
 #include "tdb.h"
 #include "proto.h"
 
+#ifdef HAVE_INTPTR_T
+#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
+#else
+#define discard_const(ptr) ((void *)(ptr))
+#endif
+#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
+
+
diff --git a/source4/lib/socket/access.c b/source4/lib/socket/access.c
index f5093177dd..c90bf203dd 100644
--- a/source4/lib/socket/access.c
+++ b/source4/lib/socket/access.c
@@ -33,6 +33,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/iconv.h"
 
 #define	FAIL		(-1)
 #define ALLONES  ((uint32_t)0xFFFFFFFF)
diff --git a/source4/lib/tdb/tools/tdbdump.c b/source4/lib/tdb/tools/tdbdump.c
index 0e179f8c3e..822f65e594 100644
--- a/source4/lib/tdb/tools/tdbdump.c
+++ b/source4/lib/tdb/tools/tdbdump.c
@@ -37,6 +37,7 @@
 #else
 
 #include "includes.h"
+#include "system/iconv.h"
 
 #endif
 
diff --git a/source4/lib/util.c b/source4/lib/util.c
index 7b6396fa93..2ce34f58d9 100644
--- a/source4/lib/util.c
+++ b/source4/lib/util.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/iconv.h"
 
 /**************************************************************************n
  Find a suitable temporary directory. The result should be copied immediately
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index 95c0b84d98..9fd6dd5356 100644
--- a/source4/lib/util_str.c
+++ b/source4/lib/util_str.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /**
  * @file
diff --git a/source4/lib/util_unistr.c b/source4/lib/util_unistr.c
index 7d10b92c43..bd4aea7c41 100644
--- a/source4/lib/util_unistr.c
+++ b/source4/lib/util_unistr.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 /* these 2 tables define the unicode case handling.  They are loaded
    at startup either via mmap() or read() from the lib directory */
-- 
cgit