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>

diff --git a/source/include/nt_status.h b/source/include/nt_status.h
index 30174e4b51904f9d2bab07e1150ffad63adaac05..bf35d913f2365e57f30673d86c3abdb3596ca69a 100644 (file)
--- 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 488996c44f915b13d90ec8353f21fcd235377e7b..1bea16eacf5e4021e6b566e2d4042fdcb38fb3f4 100644 (file)
--- 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)
-
 /****************************************************************
 ****************************************************************/