summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-01 19:30:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:35 -0500
commita8f264eb2f5b3310d721e79f9ca7e8c47064267e (patch)
tree97095054eaef60db1ce6fa5ab4c8d301b8563310 /source4/libcli
parent14da63dbd33c21602d9ca3ccd68a9a7beea6a1d8 (diff)
downloadsamba-a8f264eb2f5b3310d721e79f9ca7e8c47064267e.tar.gz
samba-a8f264eb2f5b3310d721e79f9ca7e8c47064267e.tar.bz2
samba-a8f264eb2f5b3310d721e79f9ca7e8c47064267e.zip
r25448: Remove IMMEDIATE_STRUCTURES define, which was used for splint. Newer versions of splint support immediate structures just fine.
(This used to be commit d54a47ecdc418ee07c9479f519bd1a207e6ba3eb)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/util/ntstatus.h6
-rw-r--r--source4/libcli/util/werror.h8
2 files changed, 1 insertions, 13 deletions
diff --git a/source4/libcli/util/ntstatus.h b/source4/libcli/util/ntstatus.h
index 026b5162db..84d924c2ec 100644
--- a/source4/libcli/util/ntstatus.h
+++ b/source4/libcli/util/ntstatus.h
@@ -29,15 +29,9 @@
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
/* Win32 Status codes. */
diff --git a/source4/libcli/util/werror.h b/source4/libcli/util/werror.h
index 0f49514b9f..3cd76816dc 100644
--- a/source4/libcli/util/werror.h
+++ b/source4/libcli/util/werror.h
@@ -19,7 +19,7 @@
*/
#ifndef _WERROR_H_
-#define _WERROR_H
+#define _WERROR_H_
#include <stdint.h>
@@ -29,15 +29,9 @@
from using bool for internal functions
*/
-#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 W_ERROR_IS_OK(x) (W_ERROR_V(x) == 0)
#define W_ERROR_EQUAL(x,y) (W_ERROR_V(x) == W_ERROR_V(y))