shared: move nm_utils_is_power_of_two() to nm-stdaux and add nm_utils_is_power_of_two_or_zero()

2 files changed, 21 insertions, 10 deletions

diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index a8a5360548..551cd92f16 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -1017,16 +1017,6 @@ nm_g_variant_take_ref (GVariant *v)
 
 /*****************************************************************************/
 
-/* Determine whether @x is a power of two (@x being an integer type).
- * Basically, this returns TRUE, if @x has exactly one bit set.
- * For negative values and zero, this always returns FALSE. */
-#define nm_utils_is_power_of_two(x) ({ \
-		typeof(x) __x = (x); \
-		\
-		(    (__x > ((typeof(__x)) 0)) \
-		 && ((__x & (__x - (((typeof(__x)) 1)))) == ((typeof(__x)) 0))); \
-	})
-
 #define NM_DIV_ROUND_UP(x, y) \
 	({ \
 		const typeof(x) _x = (x); \
diff --git a/shared/nm-std-aux/nm-std-aux.h b/shared/nm-std-aux/nm-std-aux.h
index 01409cefbb..b3f80bbd65 100644
--- a/shared/nm-std-aux/nm-std-aux.h
+++ b/shared/nm-std-aux/nm-std-aux.h
@@ -193,6 +193,27 @@
 	                        ((_A) > (_B)) ? (_A) : (_B),                            \
 	                        ((void)  0)))
 
+/* Determine whether @x is a power of two (@x being an integer type).
+ * Basically, this returns TRUE, if @x has exactly one bit set.
+ * For negative values and zero, this always returns FALSE. */
+#define nm_utils_is_power_of_two(x) \
+	({ \
+		typeof(x) _x2 = (x); \
+		const typeof(_x2) _X_0 = ((typeof(_x2)) 0); \
+		const typeof(_x2) _X_1 = ((typeof(_x2)) 1); \
+		\
+		(    (_x2 > _X_0) \
+		 && ((_x2 & (_x2 - _X_1)) == _X_0)); \
+	})
+
+#define nm_utils_is_power_of_two_or_zero(x) \
+	({ \
+		typeof (x) _x1 = (x); \
+		\
+		(   (_x1 == 0) \
+		 || nm_utils_is_power_of_two (_x1)); \
+	})
+
 /*****************************************************************************/
 
 #define NM_SWAP(a, b) \