Merge latest Disobedience changes

[disorder] / lib / syscalls.h

diff --git a/lib/syscalls.h b/lib/syscalls.h
index 2b6918101b27e28e9b7f42cf9de861832348f04f..f1f33836241d40e6ee38c655baea9091fdf7d338 100644 (file)
--- a/lib/syscalls.h
+++ b/lib/syscalls.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,12 +29,10 @@ struct timezone;
 
 #include <sys/socket.h>
 #include <signal.h>
-#include <stdio.h>
-
-#include "types.h"
 
 pid_t xfork(void);
-void xclose(int);
+void xclose_guts(const char *, int, int);
+#define xclose(fd) xclose_guts(__FILE__, __LINE__, fd)
 void xdup2(int, int);
 void xpipe(int *);
 int xfcntl(int, int, long);
@@ -53,8 +51,9 @@ void xgettimeofday(struct timeval *, struct timezone *);
 /* the above all call @fatal@ if the system call fails */
 
 void nonblock(int fd);
+void blocking(int fd);
 void cloexec(int fd);
-/* make @fd@ non-blocking/close-on-exec; call @fatal@ on error. */
+/* make @fd@ non-blocking/blocking/close-on-exec; call @fatal@ on error. */
 
 int mustnotbeminus1(const char *what, int value);
 /* If @value@ is -1, report an error including @what@. */