s3: move definition of W_ERROR_NOT_OK_GOTO_DONE down to libcli/util/werror.h

Michael

diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 4b34b14243808542829f06af4de20b4524ab291b..950f009f28787f683e4eee59e5bcaef70a95a00e 100644 (file)
--- 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 20f7b97745abdffda825d8606b4e081bea2f8e27..117178f3766812d7526bd25c46dbb3470d059c59 100644 (file)
--- 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)
-
 /****************************************************************
 ****************************************************************/