diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-07 12:37:48 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-13 09:35:36 +0100 |
commit | 2eca38eab9ccb4bc41ceda4992614ffb311ce4f7 (patch) | |
tree | 711f29c0fdf4f2168d2c3ffd5ab8d07f5da7e478 /lib | |
parent | 3e9b4e37e68da2b866e9cebf7ceb6624617e353b (diff) |
lib/igt_aux: s/swap/igt_swap/
It collides with the subtest naming convention glossary entry for swap.
Which makes the docbook xml stuff unhappy.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/igt.cocci | 4 | ||||
-rw-r--r-- | lib/igt_aux.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/igt.cocci b/lib/igt.cocci index fd4ad256..41a8beb3 100644 --- a/lib/igt.cocci +++ b/lib/igt.cocci @@ -92,7 +92,7 @@ expression E; - assert(E); + igt_assert(E); -// Replace open-coded swap() +// Replace open-coded igt_swap() @@ type T; T a, b, tmp; @@ -100,7 +100,7 @@ T a, b, tmp; - tmp = a; - a = b; - b = tmp; -+ swap(a, b); ++ igt_swap(a, b); // Replace open-coded min() @@ diff --git a/lib/igt_aux.h b/lib/igt_aux.h index 798a5b45..edc36a22 100644 --- a/lib/igt_aux.h +++ b/lib/igt_aux.h @@ -94,7 +94,7 @@ void intel_require_memory(uint32_t count, uint32_t size, unsigned mode); #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) -#define swap(a, b) do { \ +#define igt_swap(a, b) do { \ typeof(a) _tmp = (a); \ (a) = (b); \ (b) = _tmp; \ |