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 /libcli/util/ntstatus.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 'libcli/util/ntstatus.h')
-rw-r--r-- | libcli/util/ntstatus.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h index b7195a41b4..bf03d51d02 100644 --- a/libcli/util/ntstatus.h +++ b/libcli/util/ntstatus.h @@ -632,7 +632,11 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str); #define NT_STATUS_IS_ERR(x) ((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000) /* checking for DOS error mapping here is ugly, but unfortunately the alternative is a very intrusive rewrite of the torture code */ +#if _SAMBA_BUILD_ == 4 #define NT_STATUS_EQUAL(x,y) (NT_STATUS_IS_DOS(x)||NT_STATUS_IS_DOS(y)?ntstatus_dos_equal(x,y):NT_STATUS_V(x) == NT_STATUS_V(y)) +#else +#define NT_STATUS_EQUAL(x,y) (NT_STATUS_V(x) == NT_STATUS_V(y)) +#endif #define NT_STATUS_HAVE_NO_MEMORY(x) do { \ if (!(x)) {\ |