criu: massage exec_criu()

src/lxc/macro.h

@@ -616,12 +616,6 @@ enum {
 		-(__errno__);        \
 	})
 
-#define free_move_ptr(a, b)          \
-	({                           \
-		free(a);             \
-		(a) = move_ptr((b)); \
-	})
-
 /* Container's specific file/directory names */
 #define LXC_CONFIG_FNAME      "config"
 #define LXC_PARTIAL_FNAME     "partial"

src/lxc/memory_utils.h

@@ -83,4 +83,10 @@ static inline void *memdup(const void *data, size_t len)
 
 #define zalloc(__size__) (calloc(1, __size__))
 
+#define free_move_ptr(a, b)          \
+	({                           \
+		free(a);             \
+		(a) = move_ptr((b)); \
+	})
+
 #endif /* __LXC_MEMORY_UTILS_H */