From d5d48a684571a8a1188255e39bf29c164506a0f9 Mon Sep 17 00:00:00 2001 From: parasti Date: Fri, 11 Feb 2011 00:20:22 +0000 Subject: [PATCH] Fix missing do-while wrappers for macros git-svn-id: https://s.snth.net/svn/neverball/trunk@3489 78b8d119-cf0a-0410-b17c-f493084dd1d7 --- share/vec3.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/share/vec3.h b/share/vec3.h index 005c714..2129024 100644 --- a/share/vec3.h +++ b/share/vec3.h @@ -79,32 +79,32 @@ (u)[2] = (p)[2] + (v)[2] * (t); \ } while (0) -#define v_lerp(u, v, w, a) { \ +#define v_lerp(u, v, w, a) do { \ (u)[0] = (v)[0] * (1.0f - (a)) + (w)[0] * (a); \ (u)[1] = (v)[1] * (1.0f - (a)) + (w)[1] * (a); \ (u)[2] = (v)[2] * (1.0f - (a)) + (w)[2] * (a); \ -} +} while (0) -#define e_cpy(d, e) { \ +#define e_cpy(d, e) do { \ v_cpy((d)[0], (e)[0]); \ v_cpy((d)[1], (e)[1]); \ v_cpy((d)[2], (e)[2]); \ -} +} while (0) -#define e_orthonrm(e) { \ +#define e_orthonrm(e) do { \ v_crs((e)[0], (e)[1], (e)[2]); \ v_crs((e)[2], (e)[0], (e)[1]); \ v_nrm((e)[0], (e)[0]); \ v_nrm((e)[1], (e)[1]); \ v_nrm((e)[2], (e)[2]); \ -} +} while (0) -#define e_lerp(c, d, e, a) { \ +#define e_lerp(c, d, e, a) do { \ v_lerp((c)[0], (d)[0], (e)[0], a); \ v_lerp((c)[1], (d)[1], (e)[1], a); \ v_lerp((c)[2], (d)[2], (e)[2], a); \ e_orthonrm(c); \ -} +} while (0) /*---------------------------------------------------------------------------*/ -- 1.7.9.5