summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 06:42:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:17 -0500
commit3643fb11092e28a9538ef32cedce8ff21ad86a28 (patch)
tree30e47032832b250d66fb1f601f4d053269be4210 /source4/include
parenta1d0b97ed40fe6985bb45b1715309638e7faaffc (diff)
downloadsamba-3643fb11092e28a9538ef32cedce8ff21ad86a28.tar.gz
samba-3643fb11092e28a9538ef32cedce8ff21ad86a28.tar.bz2
samba-3643fb11092e28a9538ef32cedce8ff21ad86a28.zip
r3463: separated out some more headers (asn_1.h, messages.h, dlinklist.h and ioctl.h)
(This used to be commit b97e395c814762024336c1cf4d7c25be8da5813a)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/asn_1.h4
-rw-r--r--source4/include/includes.h17
-rw-r--r--source4/include/structs.h3
-rw-r--r--source4/include/system/glob.h1
-rw-r--r--source4/include/system/network.h3
-rw-r--r--source4/include/system/wait.h8
6 files changed, 17 insertions, 19 deletions
diff --git a/source4/include/asn_1.h b/source4/include/asn_1.h
index c10b03164a..4243f6d31f 100644
--- a/source4/include/asn_1.h
+++ b/source4/include/asn_1.h
@@ -27,13 +27,13 @@ struct nesting {
struct nesting *next;
};
-typedef struct asn1_data {
+struct asn1_data {
uint8_t *data;
size_t length;
off_t ofs;
struct nesting *nesting;
BOOL has_error;
-} ASN1_DATA;
+};
#define ASN1_APPLICATION(x) ((x)+0x60)
#define ASN1_APPLICATION_SIMPLE(x) ((x)+0x40)
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 58f8e80803..0721ef4879 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -110,18 +110,6 @@
#endif
/*
- * Define additional missing types
- */
-#ifndef HAVE_SIG_ATOMIC_T_TYPE
-typedef int sig_atomic_t;
-#endif
-
-#ifndef HAVE_SOCKLEN_T_TYPE
-typedef int socklen_t;
-#endif
-
-
-/*
Samba needs type definitions for
int8_t, int16_t, int32_t, int64_t
uint8_t, uint16_t, uint32_t and uint64_t.
@@ -194,7 +182,6 @@ extern int errno;
/* Lists, trees, caching, database... */
#include "xfile.h"
-#include "dlinklist.h"
#include "talloc.h"
#include "lib/ldb/include/ldb.h"
#include "lib/tdb/include/tdb.h"
@@ -203,9 +190,7 @@ extern int errno;
#include "db_wrap.h"
#include "nt_status.h"
#include "trans2.h"
-#include "ioctl.h"
#include "nterr.h"
-#include "messages.h"
#include "charset.h"
#include "dynconfig.h"
@@ -221,8 +206,6 @@ extern int errno;
#include "module.h"
-#include "asn_1.h"
-
#include "mutex.h"
#include "structs.h"
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 609f7df8fd..4820551b25 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -65,3 +65,6 @@ struct spnego_data;
struct gensec_security;
typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx,
char **password);
+
+struct asn1_data;
+
diff --git a/source4/include/system/glob.h b/source4/include/system/glob.h
index fc56a18b9a..676030b799 100644
--- a/source4/include/system/glob.h
+++ b/source4/include/system/glob.h
@@ -24,3 +24,4 @@
#include <glob.h>
#endif
+#include <fnmatch.h>
diff --git a/source4/include/system/network.h b/source4/include/system/network.h
index d380245865..dfecd59090 100644
--- a/source4/include/system/network.h
+++ b/source4/include/system/network.h
@@ -78,3 +78,6 @@
#define MAXHOSTNAMELEN 254
#endif
+#ifndef HAVE_SOCKLEN_T_TYPE
+typedef int socklen_t;
+#endif
diff --git a/source4/include/system/wait.h b/source4/include/system/wait.h
index 29e5c6fe66..6af01986f9 100644
--- a/source4/include/system/wait.h
+++ b/source4/include/system/wait.h
@@ -23,3 +23,11 @@
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+
+/*
+ * Define additional missing types
+ */
+#ifndef HAVE_SIG_ATOMIC_T_TYPE
+typedef int sig_atomic_t;
+#endif
+