aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-05-10 23:40:06 +0200
committerChristian Grothoff <christian@grothoff.org>2017-05-10 23:40:17 +0200
commiteb58acdbfd95856f73a4d1ff4456878a51994cd2 (patch)
tree301af7a089bbbc2d4992e7fb365cf50171bc5c08 /src
parent5031ce9079f9e5292468374fa8d4a95462e7168a (diff)
downloadgnunet-eb58acdbfd95856f73a4d1ff4456878a51994cd2.tar.gz
gnunet-eb58acdbfd95856f73a4d1ff4456878a51994cd2.zip
attempting to fix #5006
Diffstat (limited to 'src')
-rw-r--r--src/include/gnunet_scheduler_lib.h10
-rw-r--r--src/sq/Makefile.am3
2 files changed, 6 insertions, 7 deletions
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index a7385e31c..875f5043a 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -158,7 +158,7 @@ struct GNUNET_SCHEDULER_FdInfo
158 * GNUnet file handle the event is about, matches @a sock, 158 * GNUnet file handle the event is about, matches @a sock,
159 * NULL if this is about a network socket or if no network 159 * NULL if this is about a network socket or if no network
160 * handle was given to the scheduler originally. 160 * handle was given to the scheduler originally.
161 */ 161 */
162 struct GNUNET_DISK_FileHandle *fh; 162 struct GNUNET_DISK_FileHandle *fh;
163 163
164 /** 164 /**
@@ -186,7 +186,7 @@ struct GNUNET_SCHEDULER_TaskContext
186 186
187 /** 187 /**
188 * Length of the following array. 188 * Length of the following array.
189 */ 189 */
190 unsigned int fds_len; 190 unsigned int fds_len;
191 191
192 /** 192 /**
@@ -195,7 +195,7 @@ struct GNUNET_SCHEDULER_TaskContext
195 * event loop that was used. The given array should only contain 195 * event loop that was used. The given array should only contain
196 * information about file descriptors relevant to the current task. 196 * information about file descriptors relevant to the current task.
197 */ 197 */
198 const struct GNUNET_SCHEDULER_FdInfo *fds; 198 const struct GNUNET_SCHEDULER_FdInfo *fds;
199 199
200 /** 200 /**
201 * Set of file descriptors ready for reading; note that additional 201 * Set of file descriptors ready for reading; note that additional
@@ -246,7 +246,7 @@ struct GNUNET_SCHEDULER_Handle;
246 * 246 *
247 * @param sh scheduler handle that was given to the `loop` 247 * @param sh scheduler handle that was given to the `loop`
248 * @return #GNUNET_OK if there are more tasks that are ready, 248 * @return #GNUNET_OK if there are more tasks that are ready,
249 * and thus we would like to run more (yield to avoid 249 * and thus we would like to run more (yield to avoid
250 * blocking other activities for too long) 250 * blocking other activities for too long)
251 * #GNUNET_NO if we are done running tasks (yield to block) 251 * #GNUNET_NO if we are done running tasks (yield to block)
252 * #GNUNET_SYSERR on error 252 * #GNUNET_SYSERR on error
@@ -319,7 +319,7 @@ struct GNUNET_SCHEDULER_Driver
319 int 319 int
320 (*loop)(void *cls, 320 (*loop)(void *cls,
321 struct GNUNET_SCHEDULER_Handle *sh); 321 struct GNUNET_SCHEDULER_Handle *sh);
322 322
323}; 323};
324 324
325 325
diff --git a/src/sq/Makefile.am b/src/sq/Makefile.am
index cfccd89f6..119a94734 100644
--- a/src/sq/Makefile.am
+++ b/src/sq/Makefile.am
@@ -1,5 +1,5 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS) 2AM_CPPFLAGS = -I$(top_srcdir)/src/include
3 3
4if MINGW 4if MINGW
5 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 5 WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -20,7 +20,6 @@ libgnunetsq_la_SOURCES = \
20libgnunetsq_la_LIBADD = -lsqlite3 \ 20libgnunetsq_la_LIBADD = -lsqlite3 \
21 $(top_builddir)/src/util/libgnunetutil.la 21 $(top_builddir)/src/util/libgnunetutil.la
22libgnunetsq_la_LDFLAGS = \ 22libgnunetsq_la_LDFLAGS = \
23 $(POSTGRESQL_LDFLAGS) \
24 $(GN_LIB_LDFLAGS) \ 23 $(GN_LIB_LDFLAGS) \
25 -version-info 0:0:0 24 -version-info 0:0:0
26 25