diff options
| author | Michael Adam <obnox@samba.org> | 2009-02-25 16:53:05 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-03-27 14:15:45 +0100 |
| commit | 7a09208f62d9ebd988a0d3fec470607d7d7e3f21 (patch) | |
| tree | 684b65b19b6bf305fb47511fc153c27fc2058c19 | |
| parent | fea0bc19accceeea513f9f2534cc3c26f864666f (diff) | |
| download | samba-7a09208f62d9ebd988a0d3fec470607d7d7e3f21.tar.gz samba-7a09208f62d9ebd988a0d3fec470607d7d7e3f21.tar.xz samba-7a09208f62d9ebd988a0d3fec470607d7d7e3f21.zip | |
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 <obnox@samba.org>
(cherry picked from commit 76a460aecab6d5a03af9b8b5d97cba15d364cfde)
| -rw-r--r-- | source/include/nt_status.h | 6 | ||||
| -rw-r--r-- | 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 30174e4b519..bf35d913f23 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 488996c44f9..1bea16eacf5 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) - /**************************************************************** ****************************************************************/ |