diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-03 08:17:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:12 -0500 |
| commit | e0f691b1e135fd39f7a68a6d8244573d038c8485 (patch) | |
| tree | c0ed6f0d93a93ad8b904f2d3bb1c455d0684d606 | |
| parent | 2debfc918cc19e798f996f64dc5fe079b0c538cf (diff) | |
| download | samba-e0f691b1e135fd39f7a68a6d8244573d038c8485.tar.gz samba-e0f691b1e135fd39f7a68a6d8244573d038c8485.tar.bz2 samba-e0f691b1e135fd39f7a68a6d8244573d038c8485.zip | |
r13810: global data types are defined in core.h now...
metze
(This used to be commit c6137a1af982bd77e4b24d05e82c8621b36d0fac)
| -rw-r--r-- | source4/include/core.h | 8 | ||||
| -rw-r--r-- | source4/include/includes.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/include/core.h b/source4/include/core.h index 0ffbeea6a4..ab5c1a55a3 100644 --- a/source4/include/core.h +++ b/source4/include/core.h @@ -48,6 +48,14 @@ struct data_blob_list_item { /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */ typedef uint64_t NTTIME; +/* + 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); #endif /* _SAMBA_CORE_H */ diff --git a/source4/include/includes.h b/source4/include/includes.h index dc71696ac7..2d685b8ba7 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -75,14 +75,6 @@ #include <varargs.h> #endif -/* - we use struct ipv4_addr to avoid having to include all the - system networking headers everywhere -*/ -struct ipv4_addr { - uint32_t addr; -}; - /* 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}; |