From 6c197ffa3090b88663b2507006022fcd438de54c Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 25 Feb 2009 16:53:05 +0100 Subject: s3: move definition of W_ERROR_NOT_OK_GOTO_DONE down to libcli/util/werror.h Michael --- libcli/util/werror.h | 6 ++++++ source3/libnet/libnet_join.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 4b34b14243..950f009f28 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -60,6 +60,12 @@ typedef uint32_t WERROR; }\ } while (0) +#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \ + if (!W_ERROR_IS_OK(x)) {\ + goto done;\ + }\ +} while (0) + /* these are win32 error codes. There are only a few places where these matter for Samba, primarily in the NT printing code */ #define WERR_OK W_ERROR(0) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 20f7b97745..117178f376 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/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) - /**************************************************************** ****************************************************************/ -- cgit