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

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-16 13:19:31 +0000 (Thu, 16 Mar 2006)
New Revision: 14473

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

Log:
Modern splint has no problems with 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-16 13:07:56 UTC (rev 14472)
+++ branches/SAMBA_4_0/source/libcli/util/nt_status.h	2006-03-16 13:19:31 UTC (rev 14473)
@@ -22,37 +22,19 @@
 #ifndef _NT_STATUS_H
 #define _NT_STATUS_H
 
-/* The Splint code analysis tool doesn't like immediate structures. */
-
-#ifdef _SPLINT_                      /* http://www.splint.org */
-#undef HAVE_IMMEDIATE_STRUCTURES
-#endif
-
 /* the following rather strange looking definitions of NTSTATUS and WERROR
    and there in order to catch common coding errors where different error types
    are mixed up. This is especially important as we slowly convert Samba
    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)