[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8550 - in gnunet/src: core peerinfo resolver statistics tr
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8550 - in gnunet/src: core peerinfo resolver statistics transport util |
Date: |
Thu, 11 Jun 2009 09:37:45 -0600 |
Author: durner
Date: 2009-06-11 09:37:44 -0600 (Thu, 11 Jun 2009)
New Revision: 8550
Modified:
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_api_start_only.c
gnunet/src/peerinfo/test_peerinfo_api.c
gnunet/src/resolver/gnunet-service-resolver.c
gnunet/src/resolver/test_resolver_api.c
gnunet/src/statistics/gnunet-service-statistics.c
gnunet/src/statistics/test_statistics_api.c
gnunet/src/transport/Makefile.am
gnunet/src/transport/test_transport_api.c
gnunet/src/util/test_common_logging.c
gnunet/src/util/test_scheduler.c
Log:
MinGW
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2009-06-11 13:39:32 UTC (rev 8549)
+++ gnunet/src/core/test_core_api.c 2009-06-11 15:37:44 UTC (rev 8550)
@@ -314,7 +314,7 @@
#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);
Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/core/test_core_api_start_only.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -202,7 +202,7 @@
#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);
Modified: gnunet/src/peerinfo/test_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/peerinfo/test_peerinfo_api.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -157,7 +157,7 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
- waitpid (pid, NULL, 0);
+ GNUNET_OS_process_wait(p->arm_pid);
return ok;
}
Modified: gnunet/src/resolver/gnunet-service-resolver.c
===================================================================
--- gnunet/src/resolver/gnunet-service-resolver.c 2009-06-11 13:39:32 UTC
(rev 8549)
+++ gnunet/src/resolver/gnunet-service-resolver.c 2009-06-11 15:37:44 UTC
(rev 8550)
@@ -220,7 +220,14 @@
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;
}
Modified: gnunet/src/resolver/test_resolver_api.c
===================================================================
--- gnunet/src/resolver/test_resolver_api.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/resolver/test_resolver_api.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -185,7 +185,7 @@
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;
Modified: gnunet/src/statistics/gnunet-service-statistics.c
===================================================================
--- gnunet/src/statistics/gnunet-service-statistics.c 2009-06-11 13:39:32 UTC
(rev 8549)
+++ gnunet/src/statistics/gnunet-service-statistics.c 2009-06-11 15:37:44 UTC
(rev 8550)
@@ -120,7 +120,7 @@
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 @@
}
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);
}
Modified: gnunet/src/statistics/test_statistics_api.c
===================================================================
--- gnunet/src/statistics/test_statistics_api.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/statistics/test_statistics_api.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -141,7 +141,7 @@
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 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
- waitpid (pid, NULL, 0);
+ GNUNET_OS_process_wait(pid);
return ok;
}
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2009-06-11 13:39:32 UTC (rev 8549)
+++ gnunet/src/transport/Makefile.am 2009-06-11 15:37:44 UTC (rev 8550)
@@ -54,13 +54,17 @@
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)
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/transport/test_transport_api.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -255,7 +255,7 @@
#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);
}
Modified: gnunet/src/util/test_common_logging.c
===================================================================
--- gnunet/src/util/test_common_logging.c 2009-06-11 13:39:32 UTC (rev
8549)
+++ gnunet/src/util/test_common_logging.c 2009-06-11 15:37:44 UTC (rev
8550)
@@ -43,7 +43,9 @@
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");
Modified: gnunet/src/util/test_scheduler.c
===================================================================
--- gnunet/src/util/test_scheduler.c 2009-06-11 13:39:32 UTC (rev 8549)
+++ gnunet/src/util/test_scheduler.c 2009-06-11 15:37:44 UTC (rev 8550)
@@ -114,7 +114,7 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8550 - in gnunet/src: core peerinfo resolver statistics transport util,
gnunet <=