commit 0ab2a8870cc335acd99f7f4d806f802818d97014
author Bram Moolenaar <Bram@vim.org> Wed May 13 10:51:08 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Wed May 13 10:51:08 2009 +0000
tree 604a7a94f20947c47cb08fb013fb84c62b6e9ca9
parent 3c65e314b432707440593d9ecf8d016b99e8ed8c

updated for version 7.2-168

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 703b932..d5e6812 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -199,7 +199,9 @@
 #endif
 
 #ifndef SIG_ERR
-# define SIG_ERR	((RETSIGTYPE (*)())-1)
+# ifndef S_SPLINT_S
+#  define SIG_ERR	((RETSIGTYPE (*)())-1)
+# endif
 #endif
 
 /* volatile because it is used in signal handler sig_winch(). */
@@ -441,7 +443,9 @@
 
 #if defined(HAVE_TOTAL_MEM) || defined(PROTO)
 # ifdef HAVE_SYS_RESOURCE_H
-#  include <sys/resource.h>
+#  ifndef S_SPLINT_S  /* splint crashes on bits/resource.h */
+#   include <sys/resource.h>
+#  endif
 # endif
 # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL)
 #  include <sys/sysctl.h>