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 /librpc | |
| 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 'librpc')
| -rw-r--r-- | librpc/ndr/libndr.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 63b89e17f4..bedf41e965 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -302,9 +302,7 @@ typedef enum ndr_err_code (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flag typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *); typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *); -#if _SAMBA_BUILD_ == 4 -#include "libcli/util/error.h" -#endif +#include "../libcli/util/error.h" #include "librpc/gen_ndr/misc.h" extern const struct ndr_syntax_id ndr_transfer_syntax; |