From 96f2a97e011b195c5d445fd8baa0bdcfa03ec174 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 23 Sep 2006 21:41:41 +0000
Subject: r18858: arrgh! - since HAVE_IMMEDIATE_STRUCTURES were last enabled
 the code can no longer handle it (at least with gcc 4.1.2). Disable it until
 investigated and fixed properly. (This used to be commit
 c8670b33b490daeaff987c21fcb0ec601a91d54e)

---
 source3/include/nt_status.h | 4 ++--
 source3/libaddns/dnserr.h   | 2 +-
 source3/libsmb/clierror.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source3/include/nt_status.h b/source3/include/nt_status.h
index 968657ca44..f5495c8c95 100644
--- a/source3/include/nt_status.h
+++ b/source3/include/nt_status.h
@@ -34,7 +34,7 @@
    from using BOOL for internal functions 
 */
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES_XX_DISABLED)
 typedef struct {uint32 v;} NTSTATUS;
 #define NT_STATUS(x) ((NTSTATUS) { x })
 #define NT_STATUS_V(x) ((x).v)
@@ -44,7 +44,7 @@ typedef uint32 NTSTATUS;
 #define NT_STATUS_V(x) (x)
 #endif
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES_XX_DISABLED)
 typedef struct {uint32 w;} WERROR;
 #define W_ERROR(x) ((WERROR) { x })
 #define W_ERROR_V(x) ((x).w)
diff --git a/source3/libaddns/dnserr.h b/source3/libaddns/dnserr.h
index eee1303c00..013120b652 100644
--- a/source3/libaddns/dnserr.h
+++ b/source3/libaddns/dnserr.h
@@ -37,7 +37,7 @@
 
 /* Setup the DNS_ERROR typedef.  Technique takes from nt_status.h */
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES_XX_DISABLED)
 typedef struct {uint32 v;} DNS_ERROR;
 #define ERROR_DNS(x) ((DNS_ERROR) { x })
 #define ERROR_DNS_V(x) ((x).v)
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 44573bd29b..01c42bd36a 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -226,7 +226,7 @@ void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
 }
 
 /* Return a UNIX errno from a NT status code */
-static struct {
+struct {
 	NTSTATUS status;
 	int error;
 } nt_errno_map[] = {
-- 
cgit