From 2d558d5e195bc35f7af2bd1d2150bf9882d0cc24 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Mar 2006 01:36:32 +0000
Subject: r14498: Revert part of my commit that removed support for compilers
 that don't support immediate structures (This used to be commit
 657a893b25bc6669f016a9d251e07120d025f436)

---
 source4/libcli/util/nt_status.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source4/libcli')

diff --git a/source4/libcli/util/nt_status.h b/source4/libcli/util/nt_status.h
index fe1dbf866d..06aeaa3dac 100644
--- a/source4/libcli/util/nt_status.h
+++ b/source4/libcli/util/nt_status.h
@@ -28,13 +28,25 @@
    from using BOOL for internal functions 
 */
 
+#if defined(HAVE_IMMEDIATE_STRUCTURES)
 typedef struct {uint32_t v;} NTSTATUS;
 #define NT_STATUS(x) ((NTSTATUS) { x })
 #define NT_STATUS_V(x) ((x).v)
+#else
+typedef uint32_t NTSTATUS;
+#define NT_STATUS(x) (x)
+#define NT_STATUS_V(x) (x)
+#endif
 
+#if defined(HAVE_IMMEDIATE_STRUCTURES)
 typedef struct {uint32_t v;} WERROR;
 #define W_ERROR(x) ((WERROR) { x })
 #define W_ERROR_V(x) ((x).v)
+#else
+typedef uint32_t WERROR;
+#define W_ERROR(x) (x)
+#define W_ERROR_V(x) (x)
+#endif
 
 #define NT_STATUS_IS_OK(x) (NT_STATUS_V(x) == 0)
 #define NT_STATUS_IS_ERR(x) ((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000)
-- 
cgit