making it compile again after LRN's patch

2 files changed, 21 insertions, 19 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index d42999f1..480491e8 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -149,8 +149,8 @@ GLADE_CFLAGS = @GLADE_CFLAGS@
 GLADE_LIBS = @GLADE_LIBS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
-GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
+GNUNET_CFLAGS = @GNUNET_CFLAGS@
+GNUNET_LIBS = @GNUNET_LIBS@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
diff --git a/src/gnunet-gtk.c b/src/gnunet-gtk.c
index 0784432a..c33fed5e 100644
--- a/src/gnunet-gtk.c
+++ b/src/gnunet-gtk.c
@@ -226,14 +226,15 @@ gnunet_gtk_select (void *cls,
   guint allocated_nfds, need_gfds;
 
   fd_set aread, awrite, aexcept;
+  int pre_ret = 0;
+  int result = 0;
+  int socks = 0;
+  int sock_read = 0, sock_write = 0, sock_err = 0;
 
 #if WINDOWS
   int always_ready_write_fd = -1;
-  int sock_read = 0, sock_write = 0, sock_err = 0, socks = 0;
 
-  int pre_ret = 0;
   int select_ret = 0;
-  int result = 0;
 
   int read_handles = 0;
   DWORD waitstatus;
@@ -302,18 +303,18 @@ gnunet_gtk_select (void *cls,
       }
       gfds[fd_counter].fd = i;
       gfds[fd_counter].events = (isset[0] ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0)
-          | (isset[1] ? G_IO_OUT | G_IO_ERR : 0) | (issed[2] ? G_IO_ERR : 0);
+        | (isset[1] ? G_IO_OUT | G_IO_ERR : 0) | (isset[2] ? G_IO_ERR : 0);
       fd_counter += 1;
     }
     if (need_realloc)
     {
-      mc->cached_poll_array = fds = g_renew (GPollFD, fds, mc->cached_poll_array_size * 2);
-      mc->cached_poll_array_size = allocated_nfds = nfds;
+      mc->cached_poll_array = gfds = g_renew (GPollFD, gfds, mc->cached_poll_array_size * 2);
+      mc->cached_poll_array_size = allocated_nfds = mc->cached_poll_array_size * 2;
       fd_counter = 0;
       need_realloc = FALSE;
     }
     else
-      break;
+      break;  
 #else
     struct GNUNET_CONTAINER_SList_Iterator *t;
     /* We might overshoot a little, but that won't hurt very much */
@@ -473,9 +474,9 @@ gnunet_gtk_select (void *cls,
       sock_err = efds->sds.fd_count;
     }
     break;
+#endif
   }
   socks = sock_read + sock_write + sock_err;
-#endif
 
   g_main_context_prepare (mc->gmc, &mc->max_priority);
   while (allocated_nfds < (need_gfds = g_main_context_query (mc->gmc,
@@ -522,20 +523,20 @@ gnunet_gtk_select (void *cls,
 
 #if !WINDOWS
   if (rfds)
-    FD_ZERO (rfds);
+    GNUNET_NETWORK_fdset_zero (rfds);
   if (wfds)
-    FD_ZERO (wfds);
+    GNUNET_NETWORK_fdset_zero (wfds);
   if (efds)
-    FD_ZERO (efds);
+    GNUNET_NETWORK_fdset_zero (efds);
   for (i = 0; i < fd_counter; i++)
   {
     int set[3];
-    if (set[0] = FD_ISSET (gfds[i].fd, &aread))
-      FD_SET (gfds[i].fd, rfds->sds);
-    if (set[1] = FD_ISSET (gfds[i].fd, &awrite))
-      FD_SET (gfds[i].fd, wfds->sds);
-    if (set[2] = FD_ISSET (gfds[i].fd, &aexcept))
-      FD_SET (gfds[i].fd, efds->sds);
+    if ((set[0] = FD_ISSET (gfds[i].fd, &aread)))
+      FD_SET (gfds[i].fd, &rfds->sds);
+    if ((set[1] = FD_ISSET (gfds[i].fd, &awrite)))
+      FD_SET (gfds[i].fd, &wfds->sds);
+    if ((set[2] = FD_ISSET (gfds[i].fd, &aexcept)))
+      FD_SET (gfds[i].fd, &efds->sds);
     if (set[0] || set[1] || set[2])
       result += 1;
   }
@@ -684,6 +685,7 @@ gnunet_gtk_select (void *cls,
 }
 
 
+
 /**
  * Get the name of the directory where all of our package
  * data is stored ($PREFIX/share/)