svn commit: samba r14498 - in branches/SAMBA_4_0/source/libcli/util: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-17 01:36:32 +0000 (Fri, 17 Mar 2006)
New Revision: 14498

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14498

Log:
Revert part of my commit that removed support for compilers that 
don't support immediate structures

Modified:
   branches/SAMBA_4_0/source/libcli/util/nt_status.h


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/nt_status.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/nt_status.h	2006-03-17 00:45:52 UTC (rev 14497)
+++ branches/SAMBA_4_0/source/libcli/util/nt_status.h	2006-03-17 01:36:32 UTC (rev 14498)
@@ -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)