[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  6eb262f... libcli: allow ntstatus.h to be used by openchange
      from  fed8b65... s4:upgradeschema.py Update to reflect recent change in provision

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6eb262f0e8213415cfe425968c3e344a5d56e179
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Nov 25 15:30:20 2009 +1100

    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.

-----------------------------------------------------------------------

Summary of changes:
 libcli/util/ntstatus.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 88b4353..c60e424 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


-- 
Samba Shared Repository