diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 13:06:14 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 05:32:59 +0200 |
| commit | 7891848357a945581d6c94909b2d783c75afe46e (patch) | |
| tree | ae03297b74b73d402bacc72fb1dc7f014d28615f | |
| parent | 6543987139197800a3e93b768133474ed0c2d0dc (diff) | |
| download | samba-7891848357a945581d6c94909b2d783c75afe46e.tar.gz samba-7891848357a945581d6c94909b2d783c75afe46e.tar.bz2 samba-7891848357a945581d6c94909b2d783c75afe46e.zip | |
libcli/smb move FILE_TYPE constants in common
This allows us to remove another _SAMBA_BUILD_ conditional
Andrew Bartlett
| -rw-r--r-- | libcli/named_pipe_auth/npa_tstream.c | 4 | ||||
| -rw-r--r-- | libcli/smb/smb_constants.h | 8 | ||||
| -rw-r--r-- | source3/include/smb.h | 8 | ||||
| -rw-r--r-- | source4/libcli/raw/smb.h | 8 |
4 files changed, 9 insertions, 19 deletions
diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c index 2aeea5b0d3..c2eb7bf714 100644 --- a/libcli/named_pipe_auth/npa_tstream.c +++ b/libcli/named_pipe_auth/npa_tstream.c @@ -24,9 +24,7 @@ #include "../lib/tsocket/tsocket_internal.h" #include "../librpc/gen_ndr/ndr_named_pipe_auth.h" #include "../libcli/named_pipe_auth/npa_tstream.h" -#if _SAMBA_BUILD_ == 4 -#include "libcli/raw/smb.h" -#endif +#include "../libcli/smb/smb_constants.h" static const struct tstream_context_ops tstream_npa_ops; diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index 33a2a8d5b7..ed7f6ffd1e 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -71,4 +71,12 @@ enum protocol_types { FILE_ATTRIBUTE_DIRECTORY|\ FILE_ATTRIBUTE_ARCHIVE) +/* File type flags */ +#define FILE_TYPE_DISK 0 +#define FILE_TYPE_BYTE_MODE_PIPE 1 +#define FILE_TYPE_MESSAGE_MODE_PIPE 2 +#define FILE_TYPE_PRINTER 3 +#define FILE_TYPE_COMM_DEVICE 4 +#define FILE_TYPE_UNKNOWN 0xFFFF + #endif /* _SMB_CONSTANTS_H */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 36f1912b55..d41d36342d 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1085,14 +1085,6 @@ struct bitmap { #define FILE_WAS_CREATED 2 #define FILE_WAS_OVERWRITTEN 3 -/* File type flags */ -#define FILE_TYPE_DISK 0 -#define FILE_TYPE_BYTE_MODE_PIPE 1 -#define FILE_TYPE_MESSAGE_MODE_PIPE 2 -#define FILE_TYPE_PRINTER 3 -#define FILE_TYPE_COMM_DEVICE 4 -#define FILE_TYPE_UNKNOWN 0xFFFF - /* Flag for NT transact rename call. */ #define RENAME_REPLACE_IF_EXISTS 1 diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index 008ab57c0d..c1658406c4 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -381,14 +381,6 @@ #define FILE_WAS_CREATED 2 #define FILE_WAS_OVERWRITTEN 3 -/* File type flags */ -#define FILE_TYPE_DISK 0 -#define FILE_TYPE_BYTE_MODE_PIPE 1 -#define FILE_TYPE_MESSAGE_MODE_PIPE 2 -#define FILE_TYPE_PRINTER 3 -#define FILE_TYPE_COMM_DEVICE 4 -#define FILE_TYPE_UNKNOWN 0xFFFF - /* Flag for NT transact rename call. */ #define RENAME_REPLACE_IF_EXISTS 1 |