types

[oweals/gnunet.git] / src / include / gnunet_scheduler_lib.h

diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 86f709ed6f54cd573636573de5996578e05ce55d..db94f05ab832dc995255a01be732391af8d4a423 100644 (file)
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -36,9 +36,6 @@ extern "C"
 #endif
 
 
-#include "gnunet_time_lib.h"
-#include "gnunet_network_lib.h"
-
 /**
  * Opaque handle for the scheduling service.
  */
@@ -151,6 +148,9 @@ enum GNUNET_SCHEDULER_Priority
   GNUNET_SCHEDULER_PRIORITY_COUNT = 7
 };
 
+#include "gnunet_time_lib.h"
+#include "gnunet_network_lib.h"
+
 
 /**
  * Context information passed to each scheduler task.
@@ -350,7 +350,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle *sched,
                            enum GNUNET_SCHEDULER_Priority prio,
                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                            struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_NETWORK_Descriptor *rfd, GNUNET_SCHEDULER_Task main, void *cls);
+                           struct GNUNET_NETWORK_Handle *rfd, GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
@@ -383,7 +383,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle *sched,
                             enum GNUNET_SCHEDULER_Priority prio,
                             GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                             struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_NETWORK_Descriptor *wfd, GNUNET_SCHEDULER_Task main, void *cls);
+                            struct GNUNET_NETWORK_Handle *wfd, GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
@@ -412,11 +412,12 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle *sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle *sched,
-                           int run_on_shutdown,
-                           enum GNUNET_SCHEDULER_Priority prio,
-                           GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                           struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_DISK_FileHandle *rfd, GNUNET_SCHEDULER_Task main, void *cls);
+                               int run_on_shutdown,
+                               enum GNUNET_SCHEDULER_Priority prio,
+                               GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                               struct GNUNET_TIME_Relative delay,
+                               const struct GNUNET_DISK_FileHandle *rfd, 
+                               GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
@@ -445,11 +446,12 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_SCHEDULER_Handle *sched,
  */
 GNUNET_SCHEDULER_TaskIdentifier
 GNUNET_SCHEDULER_add_write_file (struct GNUNET_SCHEDULER_Handle *sched,
-                            int run_on_shutdown,
-                            enum GNUNET_SCHEDULER_Priority prio,
-                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
-                            struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_DISK_FileHandle *wfd, GNUNET_SCHEDULER_Task main, void *cls);
+                                int run_on_shutdown,
+                                enum GNUNET_SCHEDULER_Priority prio,
+                                GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
+                                struct GNUNET_TIME_Relative delay,
+                                const struct GNUNET_DISK_FileHandle *wfd,
+                                GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**