Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / syscalls.h

diff --git a/lib/syscalls.h b/lib/syscalls.h
index 296084d79b4b510a6f41377e90541108916b4d8b..326f4f0dbf8a135fb499275e875d1314a252089d 100644 (file)
--- a/lib/syscalls.h
+++ b/lib/syscalls.h
@@ -1,23 +1,23 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-2009, 2013 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/syscalls.h
+ * @brief Error-checking library call wrappers
  */
-
 #ifndef SYSCALLS_H
 #define SYSCALLS_H
 
@@ -27,29 +27,34 @@ struct sockaddr;
 struct sigaction;
 struct timezone;
 
-#include <sys/socket.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <signal.h>
-#include <stdio.h>
-
-#include "types.h"
 
+#if !_WIN32
 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);
-void xlisten(int, int);
-void xshutdown(int, int);
-void xsetsockopt(int, int, int, const void *, socklen_t);
-int xsocket(int, int, int);
-void xconnect(int, const struct sockaddr *, socklen_t);
 void xsigprocmask(int how, const sigset_t *set, sigset_t *oldset);
 void xsigaction(int sig, const struct sigaction *sa, struct sigaction *oldsa);
+int xnice(int);
+void xgettime(clockid_t clk_id, struct timespec *tp);
+void xnanosleep(const struct timespec *req, struct timespec *rem);
+#endif
+void xlisten(SOCKET, int);
+void xshutdown(SOCKET, int);
+void xsetsockopt(SOCKET, int, int, const void *, socklen_t);
+SOCKET xsocket(int, int, int);
+void xconnect(SOCKET, const struct sockaddr *, socklen_t);
 int xprintf(const char *, ...)
   attribute((format (printf, 1, 2)));
 void xfclose(FILE *);
-int xnice(int);
 void xgettimeofday(struct timeval *, struct timezone *);
+time_t xtime(time_t *when);
 /* the above all call @fatal@ if the system call fails */
 
 void nonblock(int fd);