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)

diff --git a/source3/include/nt_status.h b/source3/include/nt_status.h
index 968657ca44f7044e61d2cba3ec473dd4d7b3ef42..f5495c8c95c584db47a66b490801975312a1afca 100644 (file)
--- 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 eee1303c0009ada319722e2c5363f40126724241..013120b6524d8c9a0703501fa68c5a1ccfd3b012 100644 (file)
--- 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 44573bd29b1c4c70d9d5ff09aa9338e357ecb432..01c42bd36a6bf4d18e8a8dd338c7f6bd05a1e816 100644 (file)
--- 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[] = {