summaryrefslogtreecommitdiff
path: root/shared/nm-utils/nm-test-utils.h
diff options
context:
space:
mode:
Diffstat (limited to 'shared/nm-utils/nm-test-utils.h')
-rw-r--r--shared/nm-utils/nm-test-utils.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index adf2ba1b35..881fdcf89c 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -1272,15 +1272,6 @@ nmtst_uuid_generate (void)
#endif
-#define NMTST_SWAP(x, y) \
- G_STMT_START { \
- char __nmtst_swap_temp[sizeof((x)) == sizeof((y)) ? (signed) sizeof((x)) : -1]; \
- \
- memcpy(__nmtst_swap_temp, &(y), sizeof (__nmtst_swap_temp)); \
- memcpy(&(y), &(x), sizeof (__nmtst_swap_temp)); \
- memcpy(&(x), __nmtst_swap_temp, sizeof (__nmtst_swap_temp)); \
- } G_STMT_END
-
#define nmtst_assert_str_has_substr(str, substr) \
G_STMT_START { \
const char *__str = (str); \
@@ -2087,14 +2078,14 @@ nmtst_assert_setting_is_equal (gconstpointer /* const NMSetting * */ a,
g_assert (NM_IS_SETTING (b));
if (NM_FLAGS_HAS (r, 0x4))
- NMTST_SWAP (a, b);
+ NM_SWAP (a, b);
g_assert (nm_setting_compare ((NMSetting *) a,
(NMSetting *) b,
flags));
if (NM_FLAGS_HAS (r, 0x8))
- NMTST_SWAP (a, b);
+ NM_SWAP (a, b);
g_assert (nm_setting_diff ((NMSetting *) a,
(NMSetting *) b,