diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-23 21:41:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:01:06 -0500 |
| commit | 96f2a97e011b195c5d445fd8baa0bdcfa03ec174 (patch) | |
| tree | 79d285b58aad50dd3277ca31752166411dc92263 /source3/include | |
| parent | cf3efb2f085fbabfec829dd0796ae51228c128b6 (diff) | |
| download | samba-96f2a97e011b195c5d445fd8baa0bdcfa03ec174.tar.gz samba-96f2a97e011b195c5d445fd8baa0bdcfa03ec174.tar.bz2 samba-96f2a97e011b195c5d445fd8baa0bdcfa03ec174.zip | |
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)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/nt_status.h | 4 |
1 files changed, 2 insertions, 2 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) |