trying to fix #4003

[oweals/gnunet.git] / src / transport / test_transport_testing_startstop.c

diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c
index e1c370627724393ef8fde7b2245757f6504d894b..fd5a1a7e71618c2ffb611ae23eef64d78e141f1e 100644 (file)
--- a/src/transport/test_transport_testing_startstop.c
+++ b/src/transport/test_transport_testing_startstop.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file transport/test_transport_testing_startstop.c
@@ -24,7 +24,6 @@
  *
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_transport_service.h"
 #include "transport-testing.h"
 
@@ -33,7 +32,7 @@
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+struct GNUNET_SCHEDULER_Task * timeout_task;
 
 static struct PeerContext *p;
 
@@ -46,7 +45,7 @@ end ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
-  if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+  if (timeout_task != NULL)
     GNUNET_SCHEDULER_cancel (timeout_task);
 
   GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
@@ -56,7 +55,7 @@ end ()
 static void
 end_badly ()
 {
-  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  timeout_task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
   if (NULL != p)
@@ -101,7 +100,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (NULL == p)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start peer\n");
-    if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+    if (timeout_task != NULL)
       GNUNET_SCHEDULER_cancel (timeout_task);
     timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
   }