[vlc-devel] PATCH: C++ism in .c file, BeOS build bustage

[Cian Duffy]

Hi

The most recent patch to modules/misc/freetype.c in the trunk introduces a
C++ism to a .c file, namely that variables are declared mid-function. This
isn't handled on BeOS. This patch shouldn't change any functionality, break
any other platforms, or cause any warnings; but does allow BeOS to work
again with fribidi.

Cian

Index: modules/misc/freetype.c
===================================================================
--- modules/misc/freetype.c    (revision 13705)
+++ modules/misc/freetype.c    (working copy)
@@ -455,6 +455,10 @@
     char *psz_string;
     vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1);
     int i_font_color, i_font_alpha, i_font_size, i_red, i_green, i_blue;
+#if defined(HAVE_FRIBIDI)
+    int pos = 0;
+    int start_pos = pos;
+#endif

     FT_BBox line;
     FT_BBox glyph_size;
@@ -527,9 +531,8 @@
     {
         uint32_t *p_fribidi_string;
         p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t)
);
-
+
         /* Do bidi conversion line-by-line */
-        int pos = 0;
         while(pos < i_string_length)
         {
             while(pos < i_string_length) {
@@ -539,7 +542,6 @@
                 p_fribidi_string[pos] = i_char;
                 ++pos;
             }
-            int start_pos = pos;
             while(pos < i_string_length) {
                 i_char = psz_unicode[pos];
                 if (i_char == '\r' || i_char == '\n')


--
-------------------------
"We're busy running out of time"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20051212/591b904e/attachment.html>