[GNUnet-SVN] r27468 - gnunet/src/ats

[gnunet]

Author: LRN
Date: 2013-06-18 13:40:32 +0200 (Tue, 18 Jun 2013)
New Revision: 27468

Modified:
   gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
   gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
   gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
Log:
Rename WAIT_TIMEOUT (clashes with windows.h)

Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_address.c    2013-06-18 
08:02:14 UTC (rev 27467)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_address.c    2013-06-18 
11:40:32 UTC (rev 27468)
@@ -34,7 +34,7 @@
 
 static GNUNET_SCHEDULER_TaskIdentifier wait_task;
 
-#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
5)
+#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
 
 
 /**
@@ -147,7 +147,7 @@
     /* Request address */
     GNUNET_ATS_suggest_address (sched_ats, &p.id);
     /* Wait for timeout */
-    wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
+    wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, 
NULL);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address 
suggestion\n");

Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c 
2013-06-18 08:02:14 UTC (rev 27467)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c 
2013-06-18 11:40:32 UTC (rev 27468)
@@ -37,7 +37,7 @@
 
 static GNUNET_SCHEDULER_TaskIdentifier wait_task;
 
-#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
5)
+#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
 
 
 /**
@@ -153,7 +153,7 @@
     GNUNET_ATS_suggest_address (sched_ats, &p.id);
 
     /* Wait for timeout */
-    wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
+    wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, 
NULL);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Unexpected address 
suggestion\n", stage);

Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c    2013-06-18 
08:02:14 UTC (rev 27467)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c    2013-06-18 
11:40:32 UTC (rev 27468)
@@ -37,7 +37,7 @@
 
 static GNUNET_SCHEDULER_TaskIdentifier wait_task;
 
-#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
5)
+#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
 
 
 /**
@@ -171,7 +171,7 @@
     GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);
     /* Request address */
     GNUNET_ATS_suggest_address (sched_ats, &p.id);
-    wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
+    wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, 
NULL);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address 
suggestion\n");