MinGW

11 files changed, 24 insertions, 11 deletions

diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index e8b7fbe3b..a2924be79 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -314,7 +314,7 @@ stop_arm (struct PeerContext *p)
 #if START_ARM
   if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (p->arm_pid != waitpid (p->arm_pid, NULL, 0))
+  if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "ARM process %u stopped\n", p->arm_pid);
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 5c24c339c..c3ea85593 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -202,7 +202,7 @@ stop_arm (struct PeerContext *p)
 #if START_ARM
   if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  if (p->arm_pid != waitpid (p->arm_pid, NULL, 0))
+  if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "ARM process %u stopped\n", p->arm_pid);
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index e7d632fd5..3091a6491 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -157,7 +157,7 @@ check ()
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       ok = 1;
     }
-  waitpid (pid, NULL, 0);
+  GNUNET_OS_process_wait(p->arm_pid);
   return ok;
 }
 
diff --git a/src/resolver/gnunet-service-resolver.c b/src/resolver/gnunet-service-resolver.c
index ac50f02d0..c65adacd3 100644
--- a/src/resolver/gnunet-service-resolver.c
+++ b/src/resolver/gnunet-service-resolver.c
@@ -220,7 +220,14 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
                    AF_INET) ? "IPv4" : ((domain ==
                                          AF_INET6) ? "IPv6" : "any"),
                   gai_strerror (s));
-      if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY) || (s == EAI_SYSTEM))
+      if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY) ||
+#ifndef MINGW
+          (s == EAI_SYSTEM)
+#else
+          // FIXME NILS
+          1
+#endif
+      )
         return GNUNET_NO;       /* other function may still succeed */
       return GNUNET_SYSERR;
     }
diff --git a/src/resolver/test_resolver_api.c b/src/resolver/test_resolver_api.c
index 09be33f8c..b28dd0ca4 100644
--- a/src/resolver/test_resolver_api.c
+++ b/src/resolver/test_resolver_api.c
@@ -185,7 +185,7 @@ check ()
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       ok = 1;
     }
-  waitpid (pid, NULL, 0);
+  GNUNET_OS_process_wait(pid);
   if (ok != 0)
     fprintf (stderr, "Missed some resolutions: %u\n", ok);
   return ok;
diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c
index 676db1b02..42ff8d927 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -120,7 +120,7 @@ load (struct GNUNET_SERVER_Handle *server,
       GNUNET_free (fn);
       return;
     }
-  buf = mmap (NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+  buf = MMAP (NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
   if (MAP_FAILED == buf)
     {
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "mmap", fn);
@@ -143,7 +143,7 @@ load (struct GNUNET_SERVER_Handle *server,
         }
       off += ntohs (msg->size);
     }
-  GNUNET_break (0 == munmap (buf, sb.st_size));
+  GNUNET_break (0 == MUNMAP (buf, sb.st_size));
   GNUNET_break (0 == CLOSE (fd));
   GNUNET_free (fn);
 }
diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c
index 7a39f54b6..b9f81d652 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -141,7 +141,7 @@ check ()
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       ok = 1;
     }
-  waitpid (pid, NULL, 0);
+  GNUNET_OS_process_wait(pid);
   if (ok != 0)
     return ok;
   ok = 1;
@@ -160,7 +160,7 @@ check ()
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       ok = 1;
     }
-  waitpid (pid, NULL, 0);
+  GNUNET_OS_process_wait(pid);
   return ok;
 }
 
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 236dec7c4..4d682c60d 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -54,13 +54,17 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_transport_tcp_la_SOURCES = \
   plugin_transport_tcp.c
 libgnunet_plugin_transport_tcp_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/resolver/libgnunetresolver.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_template_la_SOURCES = \
   plugin_transport_template.c
+libgnunet_plugin_transport_template_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 6c4e94e04..ea22b9f12 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -255,7 +255,7 @@ stop_arm (struct PeerContext *p)
 #if START_ARM
   if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  waitpid (p->arm_pid, NULL, 0);
+  GNUNET_OS_process_wait(p->arm_pid);
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index eb337aac4..3d07661c2 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -43,7 +43,9 @@ main (int argc, char *argv[])
   unsigned int logs = 0;
 
   fclose (stderr);
+#ifndef MINGW
   stderr = NULL;
+#endif
   GNUNET_logger_add (&my_log, &logs);
   GNUNET_logger_add (&my_log, &logs);
   GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Testing...\n");
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index fe15e987b..855b3a08a 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -114,7 +114,7 @@ task5 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   int *ok = cls;
   GNUNET_assert (5 == *ok);
   (*ok) = 6;
-  GNUNET_assert (0 == pipe (fds));
+  GNUNET_assert (0 == PIPE (fds));
   GNUNET_SCHEDULER_add_read (tc->sched,
                              GNUNET_NO,
                              GNUNET_SCHEDULER_PRIORITY_DEFAULT,