wip

1 files changed, 12 insertions, 6 deletions

diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index ae0dc94db..95436a610 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -106,11 +106,13 @@ void gl_remove_displaylist_fonts()
   // clear variables used mostly in fl_font
   fl_graphics_driver->font(0, 0);
 
-  for (int j = 0 ; j < FL_FREE_FONT ; ++j)
+  int j;
+  for (j = 0 ; j < FL_FREE_FONT ; ++j)
   {
     Fl_Font_Descriptor *prevDesc = 0L, *nextDesc = 0L;
     Fl_Font_Descriptor *&firstDesc = *Fl_Gl_Window_Driver::global()->fontnum_to_fontdescriptor(j);
-    for (Fl_Font_Descriptor *desc = firstDesc; desc; desc = nextDesc)
+    Fl_Font_Descriptor *desc;
+    for (desc = firstDesc; desc; desc = nextDesc)
     {
       nextDesc = desc->next;
       if(desc->listbase) {
@@ -306,7 +308,8 @@ gl_texture_fifo::gl_texture_fifo(int max)
 
 gl_texture_fifo::~gl_texture_fifo()
 {
-  for (int i = 0; i < size_; i++) {
+  int i;
+  for (i = 0; i < size_; i++) {
     if (fifo[i].utf8) free(fifo[i].utf8);
     if (textures_generated) glDeleteTextures(1, &fifo[i].texName);
   }
@@ -556,7 +559,8 @@ char *Fl_Gl_Window_Driver::alpha_mask_for_string(const char *str, int n, int w,
   delete image_surface;
   // This gives us an RGB rendering of the text. We build an alpha channel from that.
   char *alpha_buf = new char [w * h];
-  for (int idx = 0; idx < w * h; ++idx)
+  int idx;
+  for (idx = 0; idx < w * h; ++idx)
   { // Fake up the alpha component using the green component's value
     alpha_buf[idx] = image->array[idx * 3 + 1];
   }
@@ -581,7 +585,8 @@ void Fl_Gl_Window_Driver::draw_string_legacy_get_list(const char* str, int n) {
     size = fl_graphics_driver->font_descriptor()->size;
     gl_font(fl_font(), Fl_Fontsize(size * gl_start_scale));
   }
-  for (unsigned i = 0; i < wn; i++) {
+  unsigned i;
+  for (i = 0; i < wn; i++) {
     unsigned int r;
     r = (buf[i] & 0xFC00) >> 10;
     get_list(gl_fontsize, r);
@@ -600,7 +605,8 @@ void Fl_Gl_Window_Driver::draw_string_legacy_glut(const char* str, int n)
 {
   uchar *str_nul = new uchar[n + 1];
   int m = 0;
-  for (int i = 0; i < n; i++) {
+  int i;
+  for (i = 0; i < n; i++) {
     if ((uchar)str[i] < 128) str_nul[m++] = str[i];
   }
   str_nul[m] = 0;