diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-30 23:15:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:14 -0500 |
| commit | 82037a75eae9deaf6ec80b5ecc3bb89aab6e6dd8 (patch) | |
| tree | 0bf7585bb48057b24bf16a9e3ec9e654a9fdffc2 /source4/include | |
| parent | 09c188e7353a74d05a674935c85e548bd09073ae (diff) | |
| download | samba-82037a75eae9deaf6ec80b5ecc3bb89aab6e6dd8.tar.gz | |
r24814: Fix headers, trim core.h even more.
(This used to be commit 9647f860bdd5c0a74583e886182bd041a45e7655)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/core.h | 22 | ||||
| -rw-r--r-- | source4/include/includes.h | 2 |
2 files changed, 2 insertions, 22 deletions
diff --git a/source4/include/core.h b/source4/include/core.h index fc66e102832..270b6406a4e 100644 --- a/source4/include/core.h +++ b/source4/include/core.h @@ -27,16 +27,6 @@ #include <stdlib.h> -/* - we use struct ipv4_addr to avoid having to include all the - system networking headers everywhere -*/ -struct ipv4_addr { - uint32_t addr; -}; - -typedef NTSTATUS (*init_module_fn) (void); - /* use the same structure for dom_sid2 as dom_sid. A dom_sid2 is really just a dom sid, but with the sub_auths represented as a conformant @@ -53,17 +43,7 @@ typedef NTSTATUS (*init_module_fn) (void); /* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */ #define dom_sid28 dom_sid -/* protocol types. It assumes that higher protocols include lower protocols - as subsets. FIXME: Move to one of the smb-specific headers */ -enum protocol_types { - PROTOCOL_NONE, - PROTOCOL_CORE, - PROTOCOL_COREPLUS, - PROTOCOL_LANMAN1, - PROTOCOL_LANMAN2, - PROTOCOL_NT1, - PROTOCOL_SMB2 -}; + /* passed to br lock code. FIXME: Move to one of the smb-specific headers */ enum brl_type { diff --git a/source4/include/includes.h b/source4/include/includes.h index ac6204921c1..d8503fe47ad 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -109,7 +109,7 @@ #endif /* Lists, trees, caching, database... */ -#include "talloc/talloc.h" +#include <talloc.h> #include "core.h" #include <stdbool.h> #include "charset/charset.h" |