diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
| commit | d70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch) | |
| tree | 92ee7a3f33ea51f34a33fee094eaed651215a3d3 /source3/include/smb.h | |
| parent | 2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff) | |
| parent | d805c714bb79a709716ec0373670283bfcd23c3c (diff) | |
| download | samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.bz2 samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip | |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
lib/util/asn1_proto.h
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 732bef1212..8b64877d86 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -137,7 +137,7 @@ enum smb_read_errors { #define OPENX_FILE_CREATE_IF_NOT_EXIST 0x10 #define OPENX_FILE_FAIL_IF_NOT_EXIST 0 -#include "doserr.h" +#include "../libcli/util/doserr.h" typedef union unid_t { uid_t uid; |