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/includes.h | |
| parent | 2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff) | |
| parent | d805c714bb79a709716ec0373670283bfcd23c3c (diff) | |
| download | samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.xz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip | |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
lib/util/asn1_proto.h
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 716235752d3..035d46fe0aa 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -590,12 +590,11 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #define talloc_get_type_abort(ptr, type) \ (type *)talloc_check_name_abort(ptr, #type) -#include "nt_status.h" #include "ads.h" #include "ads_dns.h" #include "interfaces.h" #include "trans2.h" -#include "nterr.h" +#include "../libcli/util/error.h" #include "ntioctl.h" #include "charset.h" #include "dynconfig.h" @@ -655,7 +654,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "dbwrap.h" #include "packet.h" #include "ctdbd_conn.h" -#include "talloc_stack.h" +#include "../lib/util/talloc_stack.h" #include "memcache.h" #include "async_req.h" #include "async_smb.h" |