2 files changed, 13 insertions, 7 deletions
diff --git a/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx b/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx
index 97b11b840..7f10036ff 100644
--- a/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx
+++ b/src/drivers/Unix/Fl_Unix_Screen_Driver.cxx
@@ -67,7 +67,8 @@ int Fl_Unix_Screen_Driver::poll_or_select_with_delay(double time_to_wait) {
   fl_lock_function();
 
   if (n > 0) {
-    for (int i=0; i<nfds; i++) {
+    int i;
+    for (i =0; i<nfds; i++) {
 #  if USE_POLL
       if (pollfds[i].revents) fd[i].cb(pollfds[i].fd, fd[i].arg);
 #  else
diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.cxx b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
index ab6f678aa..c7dd44068 100644
--- a/src/drivers/Unix/Fl_Unix_System_Driver.cxx
+++ b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
@@ -292,7 +292,8 @@ int Fl_Unix_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser
         res = -1;
       } else {
         struct vmount *vp = (struct vmount *) list;
-        for (int i = 0; i < res; ++i) {
+        int i;
+        for (i = 0; i < res; ++i) {
           name = (char *) vp + vp->vmt_data[VMT_STUB].vmt_off;
           strlcpy(filename, name, lname);
           // Skip the already added root filesystem
@@ -326,7 +327,7 @@ int Fl_Unix_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser
     // Get list of statvfs structures
     res = getmntinfo(&list, ST_WAIT);
     if (0 < res) {
-      for (int i = 0;  i < res; ++i) {
+      for (i = 0;  i < res; ++i) {
         strlcpy(filename, list[i].f_mntonname, lname);
         // Skip the already added root filesystem
         if (strcmp("/", filename) != 0) {
@@ -890,11 +891,13 @@ unsigned char *Fl_Unix_System_Driver::create_bmp(const unsigned char *data, int
   write_int(&c,0);
   // Pixel data
   data+=3*W*H;
-  for (int y=0;y<H;++y){
+  int y;
+  for (y =0;y<H;++y){
     data-=3*W;
     const unsigned char *s=data;
     unsigned char *p=c;
-    for (int x=0;x<W;++x){
+    int x;
+    for (x =0;x<W;++x){
       *p++=s[2];
       *p++=s[1];
       *p++=s[0];
@@ -924,9 +927,11 @@ Fl_RGB_Image *Fl_Unix_System_Driver::own_bmp_to_RGB(char *bmp) {
   bmp +=  54;
   uchar *data = new uchar[w*h*3];
   uchar *p = data;
-  for (int i = h-1; i >= 0; i--) {
+  int i;
+  for (i = h-1; i >= 0; i--) {
     char *s = bmp + i * R;
-    for (int j = 0; j < w; j++) {
+    int j;
+    for (j = 0; j < w; j++) {
       *p++=s[2];
       *p++=s[1];
       *p++=s[0];