Mercurial > vim
comparison src/os_unix.c @ 1869:720a59d79bcd
updated for version 7.2-168
author | vimboss |
---|---|
date | Wed, 13 May 2009 10:51:08 +0000 |
parents | b34d985598f6 |
children | b5c1cb6f8d56 |
comparison
equal
deleted
inserted
replaced
1868:954947a70580 | 1869:720a59d79bcd |
---|---|
197 #ifndef __EMX__ | 197 #ifndef __EMX__ |
198 static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file)); | 198 static int save_patterns __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file)); |
199 #endif | 199 #endif |
200 | 200 |
201 #ifndef SIG_ERR | 201 #ifndef SIG_ERR |
202 # define SIG_ERR ((RETSIGTYPE (*)())-1) | 202 # ifndef S_SPLINT_S |
203 # define SIG_ERR ((RETSIGTYPE (*)())-1) | |
204 # endif | |
203 #endif | 205 #endif |
204 | 206 |
205 /* volatile because it is used in signal handler sig_winch(). */ | 207 /* volatile because it is used in signal handler sig_winch(). */ |
206 static volatile int do_resize = FALSE; | 208 static volatile int do_resize = FALSE; |
207 #ifndef __EMX__ | 209 #ifndef __EMX__ |
439 return WaitForChar(0L); | 441 return WaitForChar(0L); |
440 } | 442 } |
441 | 443 |
442 #if defined(HAVE_TOTAL_MEM) || defined(PROTO) | 444 #if defined(HAVE_TOTAL_MEM) || defined(PROTO) |
443 # ifdef HAVE_SYS_RESOURCE_H | 445 # ifdef HAVE_SYS_RESOURCE_H |
444 # include <sys/resource.h> | 446 # ifndef S_SPLINT_S /* splint crashes on bits/resource.h */ |
447 # include <sys/resource.h> | |
448 # endif | |
445 # endif | 449 # endif |
446 # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL) | 450 # if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTL) |
447 # include <sys/sysctl.h> | 451 # include <sys/sysctl.h> |
448 # endif | 452 # endif |
449 # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO) | 453 # if defined(HAVE_SYS_SYSINFO_H) && defined(HAVE_SYSINFO) |