some code cleanup

1 files changed, 12 insertions, 10 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 331048d1..bf24e4ab 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -262,11 +262,11 @@ gnunet_gtk_select (void *cls,
   fd_set aread;
   fd_set awrite;
   fd_set aexcept;
-  int pre_ret = 0;
   int result = 0;
   gint max_priority;
 
 #if WINDOWS
+  int pre_ret = 0;
   int sock_read = 0;
   int sock_write = 0;
   int sock_err = 0;
@@ -416,7 +416,7 @@ gnunet_gtk_select (void *cls,
                   GNUNET_CONTAINER_slist_add (ml->handles_read,
                                               GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                               fh, sizeof (struct GNUNET_DISK_FileHandle));
-                  pre_ret += 1;
+                  pre_ret++;
                 }
             }
         }
@@ -443,7 +443,7 @@ gnunet_gtk_select (void *cls,
                       GNUNET_CONTAINER_slist_add (ml->handles_except,
                                                   GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
                                                   fh, sizeof (struct GNUNET_DISK_FileHandle));
-                      pre_ret += 1;
+                      pre_ret++;
                     }
                 }
             }
@@ -527,17 +527,18 @@ gnunet_gtk_select (void *cls,
       resize_cached_poll_array (ml,
                                 fd_counter + need_gfds);
     }
-
   ml->poll_array_active = fd_counter + need_gfds;
 
   if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
-  {
-    if (delay >= 0)
-      delay = MIN(timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value, delay);
-    else
-      delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
-  }
+    {
+      if (delay >= 0)
+        delay = GNUNET_MIN (timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value, 
+                            delay);
+      else
+        delay = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
+    }
 
+#if WINDOWS
   if (pre_ret > 0)
     {
 #if DEBUG_NETWORK
@@ -547,6 +548,7 @@ gnunet_gtk_select (void *cls,
 #endif
       delay = 0;
     }
+#endif
 
 #if DEBUG_NETWORK
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,