svn commit: samba r18858 - in branches/SAMBA_3_0/source: include libaddns libsmb

[tridge at samba.org]

Author: tridge
Date: 2006-09-23 21:41:41 +0000 (Sat, 23 Sep 2006)
New Revision: 18858

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

Log:

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.

Modified:
   branches/SAMBA_3_0/source/include/nt_status.h
   branches/SAMBA_3_0/source/libaddns/dnserr.h
   branches/SAMBA_3_0/source/libsmb/clierror.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/nt_status.h
===================================================================
--- branches/SAMBA_3_0/source/include/nt_status.h	2006-09-23 21:35:25 UTC (rev 18857)
+++ branches/SAMBA_3_0/source/include/nt_status.h	2006-09-23 21:41:41 UTC (rev 18858)
@@ -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 @@
 #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)

Modified: branches/SAMBA_3_0/source/libaddns/dnserr.h
===================================================================
--- branches/SAMBA_3_0/source/libaddns/dnserr.h	2006-09-23 21:35:25 UTC (rev 18857)
+++ branches/SAMBA_3_0/source/libaddns/dnserr.h	2006-09-23 21:41:41 UTC (rev 18858)
@@ -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)

Modified: branches/SAMBA_3_0/source/libsmb/clierror.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clierror.c	2006-09-23 21:35:25 UTC (rev 18857)
+++ branches/SAMBA_3_0/source/libsmb/clierror.c	2006-09-23 21:41:41 UTC (rev 18858)
@@ -226,7 +226,7 @@
 }
 
 /* Return a UNIX errno from a NT status code */
-static struct {
+struct {
 	NTSTATUS status;
 	int error;
 } nt_errno_map[] = {