diff options
Diffstat (limited to 'shared/nm-utils/nm-test-utils.h')
| -rw-r--r-- | shared/nm-utils/nm-test-utils.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index c5ea5e3f..d0ec7d9f 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -1144,12 +1144,13 @@ nmtst_uuid_generate (void) #endif -#define NMTST_SWAP(x,y) \ +#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(x)); \ - memcpy(&y, &x, sizeof(x)); \ - memcpy(&x, __nmtst_swap_temp, sizeof(x)); \ + 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) \ |