Rename WAIT_TIMEOUT (clashes with windows.h)

author: LRN <lrn1986@gmail.com> 2013-06-18 11:40:32 +0000
committer: LRN <lrn1986@gmail.com> 2013-06-18 11:40:32 +0000
commit: ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7 (patch)
tree: e970ecde92e1188613e5a09d25f5716494faae64 /src
parent: 34c9f5478af3cf0a1daf9b2ba1e2f2a59df538e6 (diff)
download: gnunet-ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7.tar.gz
gnunet-ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7.zip
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ats/test_ats_api_scheduling_destroy_address.c b/src/ats/test_ats_api_scheduling_destroy_address.c
index 93b90dae8..2d45d479c 100644
--- a/src/ats/test_ats_api_scheduling_destroy_address.c
+++ b/src/ats/test_ats_api_scheduling_destroy_address.c
@@ -34,7 +34,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 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 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
    /* 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");
diff --git a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
index fe9885978..100bfd249 100644
--- a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
+++ b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
@@ -37,7 +37,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 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 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *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 %u: Unexpected address suggestion\n", stage);
diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c
index 9467bdc59..8f7aed9f2 100644
--- a/src/ats/test_ats_api_scheduling_destroy_session.c
+++ b/src/ats/test_ats_api_scheduling_destroy_session.c
@@ -37,7 +37,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 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 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
    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");
author	LRN <lrn1986@gmail.com>	2013-06-18 11:40:32 +0000
committer	LRN <lrn1986@gmail.com>	2013-06-18 11:40:32 +0000
commit	ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7 (patch)
tree	e970ecde92e1188613e5a09d25f5716494faae64 /src
parent	34c9f5478af3cf0a1daf9b2ba1e2f2a59df538e6 (diff)
download	gnunet-ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7.tar.gz gnunet-ab47616dbca27ca5c9ccb40532a7b59ac9dcaad7.zip

diff --git a/src/ats/test_ats_api_scheduling_destroy_address.c b/src/ats/test_ats_api_scheduling_destroy_address.c index 93b90dae8..2d45d479c 100644 --- a/src/ats/test_ats_api_scheduling_destroy_address.c +++ b/src/ats/test_ats_api_scheduling_destroy_address.c
@@ -34,7 +34,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
34		34
35	static GNUNET_SCHEDULER_TaskIdentifier wait_task;	35	static GNUNET_SCHEDULER_TaskIdentifier wait_task;
36		36
37	#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)	37	#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
38		38
39		39
40	/**	40	/**
@@ -147,7 +147,7 @@ address_suggest_cb (void cls, const struct GNUNET_HELLO_Address address,
147	/* Request address */	147	/* Request address */
148	GNUNET_ATS_suggest_address (sched_ats, &p.id);	148	GNUNET_ATS_suggest_address (sched_ats, &p.id);
149	/* Wait for timeout */	149	/* Wait for timeout */
150	wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);	150	wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, NULL);
151	return;	151	return;
152	}	152	}
153	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");	153	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");


diff --git a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c index fe9885978..100bfd249 100644 --- a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c +++ b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
@@ -37,7 +37,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
37		37
38	static GNUNET_SCHEDULER_TaskIdentifier wait_task;	38	static GNUNET_SCHEDULER_TaskIdentifier wait_task;
39		39
40	#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)	40	#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
41		41
42		42
43	/**	43	/**
@@ -153,7 +153,7 @@ address_suggest_cb (void cls, const struct GNUNET_HELLO_Address address,
153	GNUNET_ATS_suggest_address (sched_ats, &p.id);	153	GNUNET_ATS_suggest_address (sched_ats, &p.id);
154		154
155	/* Wait for timeout */	155	/* Wait for timeout */
156	wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);	156	wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, NULL);
157	return;	157	return;
158	}	158	}
159	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Unexpected address suggestion\n", stage);	159	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Unexpected address suggestion\n", stage);


diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c index 9467bdc59..8f7aed9f2 100644 --- a/src/ats/test_ats_api_scheduling_destroy_session.c +++ b/src/ats/test_ats_api_scheduling_destroy_session.c
@@ -37,7 +37,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
37		37
38	static GNUNET_SCHEDULER_TaskIdentifier wait_task;	38	static GNUNET_SCHEDULER_TaskIdentifier wait_task;
39		39
40	#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)	40	#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
41		41
42		42
43	/**	43	/**
@@ -171,7 +171,7 @@ address_suggest_cb (void cls, const struct GNUNET_HELLO_Address address,
171	GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);	171	GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);
172	/* Request address */	172	/* Request address */
173	GNUNET_ATS_suggest_address (sched_ats, &p.id);	173	GNUNET_ATS_suggest_address (sched_ats, &p.id);
174	wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);	174	wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, NULL);
175	return;	175	return;
176	}	176	}
177	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");	177	GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");