aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-02-14 23:58:58 +0000
committerChristian Grothoff <christian@grothoff.org>2010-02-14 23:58:58 +0000
commit6e108aed24f9993be4d69147e18322d2d58b34d1 (patch)
tree2ce8384860eb80474857d60cef815f7345e8cea2 /src/include
parent9f59db64cc02445b6cc3447b8675d9e938b75f09 (diff)
downloadgnunet-6e108aed24f9993be4d69147e18322d2d58b34d1.tar.gz
gnunet-6e108aed24f9993be4d69147e18322d2d58b34d1.zip
max
Diffstat (limited to 'src/include')
-rw-r--r--src/include/gnunet_hello_lib.h1
-rw-r--r--src/include/gnunet_time_lib.h13
2 files changed, 14 insertions, 0 deletions
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 8978890f0..d7d116c74 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -120,6 +120,7 @@ struct GNUNET_HELLO_Message *GNUNET_HELLO_merge (const struct
120 GNUNET_HELLO_Message *h2); 120 GNUNET_HELLO_Message *h2);
121 121
122 122
123
123/** 124/**
124 * Iterator callback to go over all addresses. 125 * Iterator callback to go over all addresses.
125 * 126 *
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index d00867e80..8336a04fd 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -218,6 +218,19 @@ struct GNUNET_TIME_Absolute GNUNET_TIME_absolute_min (struct
218 GNUNET_TIME_Absolute t2); 218 GNUNET_TIME_Absolute t2);
219 219
220/** 220/**
221 * Return the maximum of two absolute time values.
222 *
223 * @param t1 first timestamp
224 * @param t2 other timestamp
225 * @return timestamp that is smaller
226 */
227struct GNUNET_TIME_Absolute GNUNET_TIME_absolute_max (struct
228 GNUNET_TIME_Absolute
229 t1,
230 struct
231 GNUNET_TIME_Absolute t2);
232
233/**
221 * Given a timestamp in the future, how much time 234 * Given a timestamp in the future, how much time
222 * remains until then? 235 * remains until then?
223 * 236 *