mirror of
https://github.com/samba-team/samba.git
synced 2025-03-23 06:50:21 +03:00
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)
This commit is contained in:
parent
cf3efb2f08
commit
96f2a97e01
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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[] = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user