Undo more unnecc. changes.

lib/c/2014/labcomm2014_fd_reader.c

@@ -20,6 +20,7 @@
 */
 
 #include <errno.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include "labcomm2014_private.h"

lib/c/2014/labcomm2014_fd_writer.c

@@ -20,6 +20,7 @@
 */
 
 #include <errno.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>

lib/c/2014/labcomm2014_time.c

@@ -22,17 +22,21 @@
 #include <errno.h>
 #include "labcomm2014_scheduler_private.h"
 
+#define TIME_time(time, ...) time
+#define TIME(func, ...)						\
+  if (TIME_time(__VA_ARGS__) &&				\
+      TIME_time(__VA_ARGS__)->action->func) {			\
+    return TIME_time(__VA_ARGS__)->action->func(__VA_ARGS__);	\
+  }									\
+  return -ENOSYS;
+
 int labcomm2014_time_free(struct labcomm2014_time *s)
 {
-  if (s && s->action->free)
-    return s->action->free(s);
-  return -ENOSYS;
+  TIME(free, s);
 }
 
 int labcomm2014_time_add_usec(struct labcomm2014_time *s, uint32_t usec)
 {
-  if (s && s->action->add_usec)
-    return s->action->add_usec(s, usec);
-  return -ENOSYS;
+  TIME(add_usec, s, usec);
 }