diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-16 17:51:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:31 -0500 |
| commit | 83d8fd3dcfb326354173b585905c4438405d2a74 (patch) | |
| tree | 0e89229c1774e75074d799b58f5f7057e3f7027c /source4/include | |
| parent | 3709d6b8e33496fee568035b09f49c8ef907a3ef (diff) | |
| download | samba-83d8fd3dcfb326354173b585905c4438405d2a74.tar.gz samba-83d8fd3dcfb326354173b585905c4438405d2a74.tar.bz2 samba-83d8fd3dcfb326354173b585905c4438405d2a74.zip | |
r14484: Install more headers
(This used to be commit 430c6516d383bfd7f27287394bf8eef9f174b3e6)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/core.h | 24 | ||||
| -rw-r--r-- | source4/include/includes.h | 21 |
2 files changed, 24 insertions, 21 deletions
diff --git a/source4/include/core.h b/source4/include/core.h index 28a14562ef..cb9da4dd87 100644 --- a/source4/include/core.h +++ b/source4/include/core.h @@ -24,6 +24,8 @@ #ifndef _SAMBA_CORE_H #define _SAMBA_CORE_H +#include "libcli/util/nt_status.h" + #define False (0) #define True (1) #define Auto (2) @@ -74,4 +76,26 @@ 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 { + READ_LOCK, + WRITE_LOCK, + PENDING_READ_LOCK, + PENDING_WRITE_LOCK +}; + + + #endif /* _SAMBA_CORE_H */ diff --git a/source4/include/includes.h b/source4/include/includes.h index f4642cecb9..22dc922d1b 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -95,31 +95,10 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE; #include <varargs.h> #endif -/* 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 { - READ_LOCK, - WRITE_LOCK, - PENDING_READ_LOCK, - PENDING_WRITE_LOCK -}; - #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) #include "lib/replace/replace.h" /* Lists, trees, caching, database... */ -#include "libcli/util/nt_status.h" #include "talloc/talloc.h" #include "core.h" #include "charset/charset.h" |