[Bf-blender-cvs] [c33bd97] temp-blf-wordwrap: Move struct inline (was only used in one place)

[Campbell Barton]

Commit: c33bd9712338ec173c8ac6dab757be8a0d8f75df
Author: Campbell Barton
Date:   Mon Aug 31 11:36:06 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rBc33bd9712338ec173c8ac6dab757be8a0d8f75df

Move struct inline (was only used in one place)

===================================================================

M	source/blender/blenfont/intern/blf_font.c

===================================================================

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index c46ee6c..e6c4d8e 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -649,13 +649,6 @@ void blf_font_boundbox(FontBLF *font, const char *str, size_t len, rctf *r_box,
 /** \name Word-Wrap Support
  * \{ */
 
-struct WordWrapVars {
-	int x_span;
-	size_t start, last[2];
-};
-
-#define BLF_WORDWRAP_VARS(_font, _wrap) \
-	struct WordWrapVars _wrap = {(int)_font->wrap_width, 0, {0, 0}}
 
 /**
  * Generic function to add word-wrap support for other existing functions.
@@ -677,7 +670,10 @@ static void blf_font_wrap_apply(
 
 	BLF_KERNING_VARS(font, has_kerning, kern_mode);
 
-	BLF_WORDWRAP_VARS(font, wrap);
+	struct WordWrapVars {
+		int wrap_width;
+		size_t start, last[2];
+	} wrap = {font->wrap_width, 0, {0, 0}};
 
 	blf_font_ensure_ascii_table(font);
 	// printf("%s wrapping (%d, %d) `%s`:\n", __func__, len, strlen(str), str);
@@ -698,7 +694,7 @@ static void blf_font_wrap_apply(
 			BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x);
 
 		pen_x_next = pen_x + g->advance_i;
-		if (UNLIKELY((pen_x_next >= wrap.x_span) && (wrap.start != wrap.last[0]))) {
+		if (UNLIKELY((pen_x_next >= wrap.wrap_width) && (wrap.start != wrap.last[0]))) {
 			do_draw = true;
 		}
 		else if (UNLIKELY(((i < len) && str[i]) == 0)) {