more work on FS URIs

2 files changed, 16 insertions, 3 deletions

diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index 90b04edb1..6e4b0dc42 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -59,10 +59,16 @@ extern "C"
  */
 #define GNUNET_SIGNATURE_PURPOSE_NAMESPACE_ADVERTISEMENT 3
 
+
+/**
+ * Signature of content URI placed into a namespace.
+ */
+#define GNUNET_SIGNATURE_PURPOSE_NAMESPACE_PLACEMENT 4
+
 /**
  *
  */
-#define GNUNET_SIGNATURE_PURPOSE_RESOLVER_RESPONSE 3
+#define GNUNET_SIGNATURE_PURPOSE_RESOLVER_RESPONSE 5
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 5a339e6cb..b5da09cd8 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -61,7 +61,7 @@ struct GNUNET_TIME_Relative
  */
 struct GNUNET_TIME_RelativeNBO
 {
-  uint64_t value GNUNET_PACKED;
+  uint64_t value__ GNUNET_PACKED;
 };
 
 
@@ -70,13 +70,15 @@ struct GNUNET_TIME_RelativeNBO
  */
 struct GNUNET_TIME_AbsoluteNBO
 {
-  uint64_t value GNUNET_PACKED;
+  uint64_t value__ GNUNET_PACKED;
 };
 
+
 /**
  * @brief constants to specify time
  */
 #define GNUNET_TIME_UNIT_ZERO     GNUNET_TIME_relative_get_zero()
+#define GNUNET_TIME_UNIT_ZERO_ABS GNUNET_TIME_absolute_get_zero()
 #define GNUNET_TIME_UNIT_MILLISECONDS GNUNET_TIME_relative_get_unit()
 #define GNUNET_TIME_UNIT_SECONDS GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1000)
 #define GNUNET_TIME_UNIT_MINUTES GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
@@ -104,6 +106,11 @@ struct GNUNET_TIME_AbsoluteNBO
 struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_zero (void);
 
 /**
+ * Return absolute time of 0ms.
+ */
+struct GNUNET_TIME_Absolute GNUNET_TIME_absolute_get_zero (void);
+
+/**
  * Return relative time of 1ms.
  */
 struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_unit (void);