From bc416e056c08524528988a4935157c5e06877050 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 25 Feb 2009 16:53:05 +0100 Subject: [PATCH] s3: move definition of W_ERROR_NOT_OK_GOTO_DONE down to nt_status.h where all the other W_ERROR_xyz macros are found as well. Michael Signed-off-by: Michael Adam --- source/include/nt_status.h | 6 ++++++ source/libnet/libnet_join.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/include/nt_status.h b/source/include/nt_status.h index 30174e4b51..bf35d913f2 100644 --- a/source/include/nt_status.h +++ b/source/include/nt_status.h @@ -83,6 +83,12 @@ typedef uint32 WERROR; }\ } while (0) +#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \ + if (!W_ERROR_IS_OK(x)) {\ + goto done;\ + }\ +} while (0) + /* The top byte in an NTSTATUS code is used as a type field. * Windows only uses value 0xC0 as an indicator for an NT error * and 0x00 for success. diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index 488996c44f..1bea16eacf 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -50,12 +50,6 @@ #define LIBNET_UNJOIN_OUT_DUMP_CTX(ctx, r) \ LIBNET_UNJOIN_DUMP_CTX(ctx, r, NDR_OUT) -#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \ - if (!W_ERROR_IS_OK(x)) {\ - goto done;\ - }\ -} while (0) - /**************************************************************** ****************************************************************/ -- 2.34.1