From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 25 Nov 2009 04:30:20 +0000 (+1100)
Subject: libcli: allow ntstatus.h to be used by openchange
X-Git-Tag: samba-4.0.0alpha9~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6eb262f0e8213415cfe425968c3e344a5d56e179;p=thirdparty%2Fsamba.git

libcli: allow ntstatus.h to be used by openchange

apparently ntstatus.h is used by openchange, but they don't include
replace.h. This makes that possible again.
---

diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 88b4353c1d1..c60e424f68a 100644
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -637,6 +637,14 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str);
 /** Used by ntstatus_dos_equal: */
 extern bool ntstatus_check_dos_mapping;
 
+/* we need these here for openchange */
+#ifndef likely
+#define likely(x) (x)
+#endif
+#ifndef unlikely
+#define unlikely(x) (x)
+#endif
+
 #define NT_STATUS_IS_OK(x) (likely(NT_STATUS_V(x) == 0))
 #define NT_STATUS_IS_ERR(x) (unlikely((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000))
 /* checking for DOS error mapping here is ugly, but unfortunately the