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 /source4/libcli/ldap/ldap.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 'source4/libcli/ldap/ldap.h')
| -rw-r--r-- | source4/libcli/ldap/ldap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h index a336a7ad85..09cf5e4c6f 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/ldap.h @@ -18,8 +18,8 @@ */ -#ifndef _SMB_LDAP_H -#define _SMB_LDAP_H +#ifndef _SMB_LDAP_H_ +#define _SMB_LDAP_H_ #include "lib/ldb/include/ldb.h" #include "librpc/gen_ndr/misc.h" @@ -258,4 +258,4 @@ struct ldap_message *new_ldap_message(TALLOC_CTX *mem_ctx); NTSTATUS ldap_decode(struct asn1_data *data, struct ldap_message *msg); bool ldap_encode(struct ldap_message *msg, DATA_BLOB *result, TALLOC_CTX *mem_ctx); -#endif +#endif |